Added fix to multiple adds on an existing entity