fixing more interpolation-related stuff