Fixed recursive vs non-recursive watching