FIX: freezer crash issue