diff --git a/sshch/sshch b/sshch/sshch
index 3a4c104..be845d9 100755
--- a/sshch/sshch
+++ b/sshch/sshch
@@ -133,7 +133,7 @@ def CMDConnect(aliases, command=False):
 
 
 def CMDList(option, opt, value, parser):
-    print(', '.join(str(p) for p in conf.sections()))
+    print(' '.join(str(p) for p in conf.sections()))
 
 
 def CMDFullList(option, opt, value, parser):
diff --git a/sshch_bash_completion.sh b/sshch_bash_completion.sh
index c181c10..b3255fb 100644
--- a/sshch_bash_completion.sh
+++ b/sshch_bash_completion.sh
@@ -2,7 +2,7 @@ _sshch_complete()
 {
         local cur_word alias_list
         cur_word="${COMP_WORDS[COMP_CWORD]}"
-        alias_list=`sshch -l | sed 's/,//g'`
+        alias_list=`sshch -l`
         COMPREPLY=($(compgen -W "$alias_list" -- $cur_word))
         return 0
 }