Marwane

I spent a few hours doing this so I thought it may be useful to other people in the future since this PR has not received any modification for almost...

This seems to happen only on nightly since switching from nightly to stable fixes the problem for me