#380649 fixed