Fixed BOP compatibility