Fix MS start issue