More 2.x compatibility