Fix automatic dictionary loading
Merge pull request #1799 from wmtan/FixAutomaticDictionaryLoading

Fix automatic dictionary loading