interpolation fixes