Fixed regression of previous commit