LH-480 Fixed regression bug