Made it Python 2.5 friendly