fixed 2.1 compatibility issue