fix bugs in watch