Better Python2.6 compatibility