Modified for Python 2.6