Yet another fix attempt.