fixed MS issue