fix issue with watch