Fixed: python2.6 compatability