Additional change to make it compatible with Python3