Regression fix #587

AlexAltea , just for your sake of convenience :)