3.1.x compatibility