1.3.x compatibility