diff --git a/src/se/vidstige/jadb/managers/Bash.java b/src/se/vidstige/jadb/managers/Bash.java
index 3f2ef04..6770a8d 100644
--- a/src/se/vidstige/jadb/managers/Bash.java
+++ b/src/se/vidstige/jadb/managers/Bash.java
@@ -2,8 +2,8 @@ package se.vidstige.jadb.managers;
 
 public class Bash {
     public static String quote(String s) {
-        // TODO: Should also check other whitespace
-        if (!s.contains(" ")) {
+        // Check that s contains no whitespace
+        if (s.matches("\\S+")) {
             return s;
         }
         return "'" + s.replace("'", "'\\''") + "'";