1.7.x compatibility