Fix 2.11 build