Fixing 2.6 and 3.2 compatibility