Fix primitive usage to avoid interpolation on data