Fixed watch and hide bug