Hotfix for r373.
Well done devs ! You just fixed some bugs and added more code that will produce some further bugs !
By the way, thanks for your work and your time !