1.8.x compatibility