Added compatibility for 2.x unicode