added interpolation fix but wont work always