Another go at fix