Fixed regression bug