Another try at fix.