Reading the TODO comment for python 3, having the long in python 2 seems wrong...