Un-resolved locale naming bug exists. Another try to fix that