fix issue on watching