Core/Unit: Re-applying crash fix