Fix for non-unique characters