Slight out-of-range improvement

More generic this way.