fix watch argument juggling