Fixed the 3.6 build.