Fixed issue with python 2.5.2 bug