ERT-769 Set MSW flag in the correct place