3.x compatibility