diff --git a/.clang_format.hook b/.clang_format.hook
index 40d70f56..8141fffb 100755
--- a/.clang_format.hook
+++ b/.clang_format.hook
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-readonly VERSION="3.8"
+readonly VERSION="3.6"
 
 version=$(clang-format -version)
 
diff --git a/decoders/swig/scorer.cpp b/decoders/swig/scorer.cpp
index 39da13d1..27b61cd0 100644
--- a/decoders/swig/scorer.cpp
+++ b/decoders/swig/scorer.cpp
@@ -149,11 +149,15 @@ void Scorer::set_char_map(const std::vector<std::string>& char_list) {
   char_list_ = char_list;
   char_map_.clear();
 
+  // Set the char map for the FST for spelling correction
   for (size_t i = 0; i < char_list_.size(); i++) {
     if (char_list_[i] == " ") {
       SPACE_ID_ = i;
     }
-    char_map_[char_list_[i]] = i + 1;  // Force index starting from zero
+    // The initial state of FST is state 0, hence the index of chars in
+    // the FST should start from 1 to avoid the conflict with the initial
+    // state, otherwise wrong decoding results would be given.
+    char_map_[char_list_[i]] = i + 1;
   }
 }