Fix the assumption for Python2 as well (#2)