Fix issue with the linear interpolation leftover from the change to classes