Another try at a fix