Fixes #770
Merge pull request #771 from Wiseon3/fixEditableLocale

Fixes #770