fix bug: var initialized != entity initialized (part 2)