1.10.x compatibility fix