Fix interpolation
Merge branch 'patch-1'