Fixed an issue with watch