2.6 build fix