diff --git a/Source/Engine/LanguageModel/PhraseReplacementMap.mm b/Source/Engine/LanguageModel/PhraseReplacementMap.mm
index e2ed00ab..433fcad5 100644
--- a/Source/Engine/LanguageModel/PhraseReplacementMap.mm
+++ b/Source/Engine/LanguageModel/PhraseReplacementMap.mm
@@ -15,6 +15,7 @@
 #include "KeyValueBlobReader.h"
 #include "PhraseReplacementMap.h"
 #include "LMConsolidator.h"
+#include "vChewing-Swift.h"
 
 namespace vChewing {
 
@@ -39,9 +40,14 @@ bool PhraseReplacementMap::open(const char *path)
     if (data) {
         return false;
     }
-    
+
     LMConsolidator::FixEOF(path);
-    LMConsolidator::ConsolidateContent(path, false);
+
+    if (Preferences.shouldAutoSortPhraseReplacementMapOnLoad) {
+        LMConsolidator::ConsolidateContent(path, true);
+    } else {
+        LMConsolidator::ConsolidateContent(path, false);
+    }
 
     fd = ::open(path, O_RDONLY);
     if (fd == -1) {
diff --git a/Source/Engine/LanguageModel/UserPhrasesLM.mm b/Source/Engine/LanguageModel/UserPhrasesLM.mm
index fe94a305..f5901d40 100644
--- a/Source/Engine/LanguageModel/UserPhrasesLM.mm
+++ b/Source/Engine/LanguageModel/UserPhrasesLM.mm
@@ -15,6 +15,7 @@
 #include <syslog.h>
 #include "LMConsolidator.h"
 #include "KeyValueBlobReader.h"
+#include "vChewing-Swift.h"
 
 namespace vChewing {
 
@@ -39,7 +40,12 @@ bool UserPhrasesLM::open(const char *path)
     }
 
     LMConsolidator::FixEOF(path);
-    LMConsolidator::ConsolidateContent(path, false);
+
+    if (Preferences.ShouldAutoSortUserPhrasesAndExclListOnLoad) {
+        LMConsolidator::ConsolidateContent(path, true);
+    } else {
+        LMConsolidator::ConsolidateContent(path, false);
+    }
 
     fd = ::open(path, O_RDONLY);
     if (fd == -1) {
diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm
index 7f3303c5..2c711495 100644
--- a/Source/InputMethodController.mm
+++ b/Source/InputMethodController.mm
@@ -7,7 +7,6 @@
  */
 
 #import "InputMethodController.h"
-#include <objc/objc.h>
 #import <fstream>
 #import <iostream>
 #import <set>