fixed entity.data overwriting bug