diff --git a/include/functions b/include/functions
index e4776ed8..39dd8697 100644
--- a/include/functions
+++ b/include/functions
@@ -496,11 +496,11 @@
                     INDENT=$1
                 ;;
                 --result)
-                    shift
+                    shift $(( $# > 0 ? 1 : 0 ))
                     RESULT=$1
                 ;;
                 --text)
-                    shift
+                    shift $(( $# > 0 ? 1 : 0 ))
                     TEXT=$1
                 ;;
                 *)
@@ -509,7 +509,7 @@
                 ;;
             esac
             # Go to next parameter
-            shift
+            shift $(( $# > 0 ? 1 : 0 ))
         done
 
         if [ -z "${RESULT}" ]; then