Fix scoping and off-by-1 error in disabling