FIX: Python2/3 unicode problems