Issue/fix build 211

Fix the 2.11 build. Depends on PR #422