Fix problem with MS