Trying to fix Python 3 support