Make sure entities are cloned properly