Better range handling.