Fix for unicode