Update #321 for python 2.6