First try at fix