Fix MS standard