Change for 2.10.x compatibility