1.6.8.4 improve repl performance