Added fix for primitive items as well