Improve bump methods to avoid argument aou of range error