Fix support AOO 4