I would also move the decrement above the conditional