fix Monitor bugs