Addressed unicode issue