BAO fix cim & crash