Created by: MarianoGnu
After this change i could not replicate the issue anymore, i hope it's correct thought