Fix for python != 2.7