Fix 2.10 compile failure