added performance fix for unicode package