Fix prefix and range