Fix to nasty M.S.N. bug