2.5.x compatibility