fixed 1.6 compatibility issue