fixing more bugs in interpolate pull request