diff --git a/.clang-format b/.clang-format
index 30863c27a8fdc1e9c94c8cd741bfc0d7031fc912..af946a4a90447acdb94b66143ce3ee47fd6e4043 100644
--- a/.clang-format
+++ b/.clang-format
@@ -16,8 +16,8 @@
 ---
 Language:        Cpp
 BasedOnStyle:  Google
-IndentWidth:     2
-TabWidth:        2
+IndentWidth:     4
+TabWidth:        4
 ContinuationIndentWidth: 4
 MaxEmptyLinesToKeep: 2
 AccessModifierOffset: -2  # The private/protected/public has no indent in class
diff --git a/deepspeech/decoders/swig/ctc_beam_search_decoder.cpp b/deepspeech/decoders/swig/ctc_beam_search_decoder.cpp
index 68aec20901d0964b0908ccfe81fd09f0e416152b..f4dd797dc6ac3015eff51e9baa4b0b406126721d 100644
--- a/deepspeech/decoders/swig/ctc_beam_search_decoder.cpp
+++ b/deepspeech/decoders/swig/ctc_beam_search_decoder.cpp
@@ -40,13 +40,15 @@ std::vector<std::pair<double, std::string>> ctc_beam_search_decoder(
   size_t num_time_steps = probs_seq.size();
   for (size_t i = 0; i < num_time_steps; ++i) {
     VALID_CHECK_EQ(probs_seq[i].size(),
-                   vocabulary.size() + 1,
+                  // vocabulary.size() + 1,
+                  vocabulary.size(),
                    "The shape of probs_seq does not match with "
                    "the shape of the vocabulary");
   }
 
   // assign blank id
-  size_t blank_id = vocabulary.size();
+  //size_t blank_id = vocabulary.size();
+  size_t blank_id = 0;
 
   // assign space id
   auto it = std::find(vocabulary.begin(), vocabulary.end(), " ");
diff --git a/deepspeech/decoders/swig/setup.sh b/deepspeech/decoders/swig/setup.sh
old mode 100644
new mode 100755