Please try applying these settings to your code.
If we try to update things get worst.
Actually they get worst every time we resave. :(
PS: For a long time now (because of this issue) we are forced to use the very old v2.2 which works as expected. :)