Index: cli.py
==================================================================
--- cli.py
+++ cli.py
@@ -208,11 +208,11 @@
                             echo("  {:<32} {}".format(sMorph, oLexGraphe.formatTags(sMorph)))
             elif sText.startswith("!"):
                 for sWord in sText[1:].strip().split():
                     if sWord:
                         echo(" | ".join(oDict.suggest(sWord)))
-                        echo(" | ".join(oDict.suggest2(sWord)))
+                        #echo(" | ".join(oDict.suggest2(sWord)))
             elif sText.startswith(">"):
                 oDict.drawPath(sText[1:].strip())
             elif sText.startswith("="):
                 for sRes in oDict.select(sText[1:].strip()):
                     echo(sRes)

Index: gc_core/py/ibdawg.py
==================================================================
--- gc_core/py/ibdawg.py
+++ gc_core/py/ibdawg.py
@@ -295,15 +295,13 @@
                     self._suggest(oSuggResult, sRepl + sRemain[1:], nMaxSwitch, nMaxDel, nMaxHardRepl, nDeep+1, iAddr, sNewWord, cCurrent+">"+sRepl, True)
                 for sRepl in cp.d2toX.get(sRemain[0:2], ()):
                     self._suggest(oSuggResult, sRepl + sRemain[2:], nMaxSwitch, nMaxDel, nMaxHardRepl, nDeep+1, iAddr, sNewWord, sRemain[0:2]+">"+sRepl, True)
                 # Hard replacements
                 if nDeep > 3 and nMaxHardRepl:
-                    for nVal, kAddr in self._getArcs1(iAddr):
-                        if nVal in self.dCharVal:
-                            cChar = self.dCharVal[nVal]
-                            if cChar not in cp.d1to1.get(cCurrent, ""):
-                                self._suggest(oSuggResult, sRemain[1:], nMaxSwitch, nMaxDel, nMaxHardRepl-1, nDeep+1, kAddr, sNewWord+cChar, "[["+cChar+"]]", True)
+                    for cChar, kAddr in self._getCharArcs(iAddr):
+                        if cChar not in cp.d1to1.get(cCurrent, ""):
+                            self._suggest(oSuggResult, sRemain[1:], nMaxSwitch, nMaxDel, nMaxHardRepl-1, nDeep+1, kAddr, sNewWord+cChar, "[["+cChar+"]]", True)
             # end of word
             if len(sRemain) == 2:
                 for sRepl in cp.dFinal2.get(sRemain, ()):
                     self._suggest(oSuggResult, sRepl, nMaxSwitch, nMaxDel, nMaxHardRepl, nDeep+1, iAddr, sNewWord, sRemain + " >> " + sRepl, True)
             elif len(sRemain) == 1: