I'll look into that in another PR. The interpolation should of course be used for the linear interpolation too.