Interpolation fix