Fix for MT#05523 (nw)