[AC 21.5] FOR_MSW fix