Fix for non unicode support