Fixed some incorrect range imputation