Fixed regression in previous commits