One more fix attempt.