Fixes #320. Note: Interpolation is still not quite correct and may have remaining artifacts at the epsilon-T region.