Another try at fixing #476