fix 2.6 and 3.3 compatibility