Fix: Differentiate between bytes and Python 2.x unicode