1.2.x compatibility