One more attempt at a fix