locale collision bug fix