diff --git a/drone/org_secret_add.go b/drone/org_secret_add.go
index 52ac250d..c9145fb2 100644
--- a/drone/org_secret_add.go
+++ b/drone/org_secret_add.go
@@ -42,7 +42,7 @@ var orgSecretAddCmd = cli.Command{
 }
 
 func orgSecretAdd(c *cli.Context) error {
-	if len(c.Args().Tail()) != 3 {
+	if len(c.Args()) != 3 {
 		cli.ShowSubcommandHelp(c)
 		return nil
 	}
diff --git a/drone/org_secret_list.go b/drone/org_secret_list.go
index ea0144b9..550224d0 100644
--- a/drone/org_secret_list.go
+++ b/drone/org_secret_list.go
@@ -35,7 +35,7 @@ var orgSecretListCmd = cli.Command{
 }
 
 func orgSecretList(c *cli.Context) error {
-	if len(c.Args().Tail()) != 1 {
+	if len(c.Args()) != 1 {
 		cli.ShowSubcommandHelp(c)
 		return nil
 	}
diff --git a/drone/org_secret_rm.go b/drone/org_secret_rm.go
index c0b4170d..fc46d7b6 100644
--- a/drone/org_secret_rm.go
+++ b/drone/org_secret_rm.go
@@ -17,7 +17,7 @@ var orgSecretRemoveCmd = cli.Command{
 }
 
 func orgSecretRemove(c *cli.Context) error {
-	if len(c.Args().Tail()) != 2 {
+	if len(c.Args()) != 2 {
 		cli.ShowSubcommandHelp(c)
 		return nil
 	}