replace naive interpolation logic with more exact logic

replace naive interpolation logic with more exact logic #489