Regression fix #587

AlexAltea , just for the sake of your convenience :)

Courtesy of [DH]