Fixing 3.1.2 build failure