One last final fix for 0ad76843. Tested on py3 and py2