Fixed interpolation issues