Fixed Interpolation bug