fixed interpolation bugs