Interpolation fixes for issue 1758