fix doWatch