Fix MT 5245 [Alex Jackson]