Fixed Entity update