NaN% bug fixed