Another fix attempt.