Fix interpolation bug