Fix to support AOO 4.0, planned