Fix BOP support