diff --git a/bin/untilfail b/bin/untilfail
index e9be500..d42036d 100755
--- a/bin/untilfail
+++ b/bin/untilfail
@@ -1,10 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 count=1
 echo "====> Attempt $count"
-$@
-(( count++ ))
-while [ $? -eq 0 ]; do
-  echo "====> Attempt $count"
-  $@
+while "$@"; do
   (( count++ ))
+  echo "====> Attempt $count"
 done