Fixed python 2.7 support