Fix for unicode issue