fix 2.10 compatibility issue