Existing entity update fix