Fixed EA-46629