fixed 2.6 compatibility