EntityBuilding fix