Better fix for Hashed prim property values