fixed issues with watch