Fixed MT05436 (nw)