fix for simple primitives