Bug Fix: i18n beta support