Fixed Python 3 support