diff --git a/src/main.cpp b/src/main.cpp
index 09ce05e..f4e699d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -98,7 +98,7 @@ int main(int argc, char* argv[])
       {
         first_run=false;
         // resolve shebang
-        bool shebang_is_bin = basename(argv[0]) == basename(tsh->shebang);
+        bool shebang_is_bin = ( basename(argv[0]) == basename(tsh->shebang) );
         if(shebang_is_bin)
           tsh->shebang="#!/bin/sh";
 
diff --git a/src/util.cpp b/src/util.cpp
index 10a0214..e109be7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -24,7 +24,7 @@ std::string basename(std::string const& in)
 {
   size_t slr=in.rfind('/');
   if(slr != std::string::npos)
-    return in.substr(slr);
+    return in.substr(slr+1);
   else
     return in;
 }