Fix for new interpolation