Fixed regression in previous commit