fix monitor bugs