Fixed regression issue