Fix MT 4157, MT 5404 [Alex Jackson]