fix Monitor's bugs