core added, fire problem fix