Fixed 3.x build