diff --git a/src/System/Console/StructuredCLI.hs b/src/System/Console/StructuredCLI.hs
--- a/src/System/Console/StructuredCLI.hs
+++ b/src/System/Console/StructuredCLI.hs
@@ -485,7 +485,7 @@
                 ("?", _) ->
                   return $ Fail hint rest
                 ("", remaining) ->
-                  return $ Partial [] remaining
+                  return $ Partial [("", hint)] remaining
                 (word, remaining) -> do
                   v <- validator word
                   return $ maybe (badArg rest) (\x -> Done x (matched ++ ' ':word) remaining) v
diff --git a/structured-cli.cabal b/structured-cli.cabal
--- a/structured-cli.cabal
+++ b/structured-cli.cabal
@@ -1,5 +1,5 @@
 name:                structured-cli
-version:             2.5.0.1
+version:             2.5.0.2
 synopsis:            Application library for building interactive console CLIs
 description:         This module provides the tools to build a complete "structured" CLI application, similar to those found in systems like Cisco IOS or console configuration utilities etc. It aims to be easy for implementors to use.
 homepage:            https://gitlab.com/codemonkeylabs/structured-cli#readme