0.6 build fix