fix for watchmode