fixed logic to use locale_fallback, issue #884