Pull request fix

Merge this on your dev branch and then you can merge your dev on your stable