Fixed regression from previous commit