FIX bug and python < 2.7 compatibility