Added fix to avoid overwriting with primitives
Merge with origin