diff --git a/src/DictTrie.hpp b/src/DictTrie.hpp
index c704644..192fa94 100644
--- a/src/DictTrie.hpp
+++ b/src/DictTrie.hpp
@@ -25,12 +25,12 @@ const char* const UNKNOWN_TAG = "";
 class DictTrie {
  public:
   enum UserWordWeightOption {
-    Min,
-    Median,
-    Max,
+    WordWeightMin,
+    WordWeightMedian,
+    WordWeightMax,
   }; // enum UserWordWeightOption
 
-  DictTrie(const string& dict_path, const string& user_dict_paths = "", UserWordWeightOption user_word_weight_opt = Median) {
+  DictTrie(const string& dict_path, const string& user_dict_paths = "", UserWordWeightOption user_word_weight_opt = WordWeightMedian) {
     Init(dict_path, user_dict_paths, user_word_weight_opt);
   }
 
@@ -40,7 +40,7 @@ class DictTrie {
 
   bool InsertUserWord(const string& word, const string& tag = UNKNOWN_TAG) {
     DictUnit node_info;
-    if (!MakeNodeInfo(node_info, word, max_weight_, tag)) {
+    if (!MakeNodeInfo(node_info, word, user_word_default_weight_, tag)) {
       return false;
     }
     active_node_infos_.push_back(node_info);
@@ -112,7 +112,7 @@ class DictTrie {
         DictUnit node_info;
         MakeNodeInfo(node_info, 
               buf[0], 
-              max_weight_,
+              user_word_default_weight_,
               (buf.size() == 2 ? buf[1] : UNKNOWN_TAG));
         static_node_infos_.push_back(node_info);
         if (node_info.word.size() == 1) {
@@ -172,10 +172,10 @@ class DictTrie {
     max_weight_ = x[x.size() - 1].weight;
     median_weight_ = x[x.size() / 2].weight;
     switch (option) {
-     case Min:
+     case WordWeightMin:
        user_word_default_weight_ = min_weight_;
        break;
-     case Median:
+     case WordWeightMedian:
        user_word_default_weight_ = median_weight_;
        break;
      default:
diff --git a/test/unittest/trie_test.cpp b/test/unittest/trie_test.cpp
index ffdfd8c..12e6e3a 100644
--- a/test/unittest/trie_test.cpp
+++ b/test/unittest/trie_test.cpp
@@ -70,6 +70,18 @@ TEST(DictTrieTest, UserDict) {
   ASSERT_TRUE(unit);
   string res ;
   res << *unit;
+  ASSERT_EQ("[\"20113\", \"35745\", \"31639\"]  -14.100", res);
+}
+
+TEST(DictTrieTest, UserDictWithMaxWeight) {
+  DictTrie trie(DICT_FILE, "../test/testdata/userdict.utf8", DictTrie::WordWeightMax);
+  string word = "云计算";
+  Unicode unicode;
+  ASSERT_TRUE(TransCode::decode(word, unicode));
+  const DictUnit * unit = trie.Find(unicode.begin(), unicode.end());
+  ASSERT_TRUE(unit);
+  string res ;
+  res << *unit;
   ASSERT_EQ("[\"20113\", \"35745\", \"31639\"]  -2.975", res);
 }