FIX: Fix unicode+Py3k support