diff --git a/src/rime/context.cc b/src/rime/context.cc
index ccb7b941..1ab6567f 100644
--- a/src/rime/context.cc
+++ b/src/rime/context.cc
@@ -19,8 +19,8 @@ bool Context::Commit() {
   commit_notifier_(this);
   // start over
   Clear();
-  if (get_option("is_buffered"))
-	  set_option("is_buffered", false);
+  //if (get_option("is_buffered"))
+	 // set_option("is_buffered", false);
   return true;
 }
 
diff --git a/src/rime/gear/speller.cc b/src/rime/gear/speller.cc
index 17154dd4..e109ab93 100644
--- a/src/rime/gear/speller.cc
+++ b/src/rime/gear/speller.cc
@@ -117,11 +117,11 @@ namespace rime {
 			&& boost::regex_match(schema, boost::regex("^sbpy$")) && belongs_to(c1, initials_);
 		bool is_editable = is_popped && len >= 4 && !is_initial;
 
-		if (ctx->input().length() == 1 && ctx->input()[0] == 'e' && is_sbxlm
-			&& string("qwrtsdfgzxcvbyphjklnm").find(ch) != string::npos) {
-			ctx->set_option("is_buffered", true);
-			ctx->Clear();
-		}
+		//if (ctx->input().length() == 1 && ctx->input()[0] == 'e' && is_sbxlm
+		//	&& string("qwrtsdfgzxcvbyphjklnm").find(ch) != string::npos) {
+		//	ctx->set_option("is_buffered", true);
+		//	ctx->Clear();
+		//}
 
 		if (!is_initial &&
 			expecting_an_initial(ctx, alphabet_, finals_)) {