Localization fix, fixes Issue #22