Improve range handling for firmware versions 1028-1030