Added WATCH_DISABLED in end of while loop