fix bug with watch