Bug fix attempt.