Bug fix, return next number behavior