Repaired last fix which didn't really solve the problem.