Fix issue #37 at next highest number