Fix to use interpolation correctly