fix
more interpolation work