Fixed regression after development