Fixed watch command loop. :ship: