Trying to fix Python 2.6 compatibility