Add underflow check