diff --git a/langpuppet/gapi.go b/langpuppet/gapi.go
index 3f533830..e722956f 100644
--- a/langpuppet/gapi.go
+++ b/langpuppet/gapi.go
@@ -123,13 +123,13 @@ func (obj *GAPI) Cli(cliInfo *gapi.CliInfo) (*gapi.Deploy, error) {
 	var langDeploy *gapi.Deploy
 	var puppetDeploy *gapi.Deploy
 	langCliInfo := &gapi.CliInfo{
-		CliContext: cli.NewContext(c.App, flagSet, nil),
+		CliContext: cli.NewContext(c.App, flagSet, c.Parent()),
 		Fs:         fs,
 		Debug:      debug,
 		Logf:       logf, // TODO: wrap logf?
 	}
 	puppetCliInfo := &gapi.CliInfo{
-		CliContext: cli.NewContext(c.App, flagSet, nil),
+		CliContext: cli.NewContext(c.App, flagSet, c.Parent()),
 		Fs:         fs,
 		Debug:      debug,
 		Logf:       logf, // TODO: wrap logf?