diff --git a/.zshrc.d/ctools.zsh b/.zshrc.d/ctools.zsh
index 593b18d..8bbbfa8 100644
--- a/.zshrc.d/ctools.zsh
+++ b/.zshrc.d/ctools.zsh
@@ -2,20 +2,30 @@ TAIL_CMD=`which tail`
 JOURNALCTL_CMD=`which journalctl`
 
 tail () {
+   ARGS=''
+    for i in "$@"; do
+        i="${i//\\/\\\\}"
+        ARGS="$ARGS \"${i//\"/\\\"}\""
+    done
     if grep -q -i "\-f" <<< "$*"
     then
-        $TAIL_CMD $* | ccze -A
+        bash -c "$TAIL_CMD $ARGS | ccze -A"
     else
-        $TAIL_CMD $*
+        bash -c "$TAIL_CMD $ARGS"
     fi
 }
 
 journalctl () {
+   ARGS=''
+    for i in "$@"; do
+        i="${i//\\/\\\\}"
+        ARGS="$ARGS \"${i//\"/\\\"}\""
+    done
     if grep -q "\-f" <<< "$*"
     then
-        $JOURNALCTL_CMD $* | ccze -A
+        bash -c "$JOURNALCTL_CMD $ARGS | ccze -A"
     else
-        $JOURNALCTL_CMD $*
+        bash -c "$JOURNALCTL_CMD $ARGS"
     fi
 }
 
diff --git a/bin b/bin
index 9929539..b536b75 160000
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit 9929539860761a8af03d8e25443885e1d33e1058
+Subproject commit b536b751cdce768cdce0a6e787bb24d4b18b5db9