Another try at the fix