Potential fix for build 2.10.x