diff --git a/PENDING.md b/PENDING.md
index 85f740b964..05a4988eb0 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -94,6 +94,7 @@ BUG FIXES
 
   - \#2733 [x/gov, x/mock/simulation] Fix governance simulation, update x/gov import/export
   - \#2854 [x/bank] Remove unused bank.MsgIssue, prevent possible panic
+  - \#2884 [docs/examples] Fix `basecli version` panic
 
 * Tendermint
   * [\#2797](https://github.com/tendermint/tendermint/pull/2797) AddressBook requires addresses to have IDs; Do not crap out immediately after sending pex addrs in seed mode
diff --git a/docs/examples/basecoin/cmd/basecli/main.go b/docs/examples/basecoin/cmd/basecli/main.go
index cb0eeba5b9..8093dd3b10 100644
--- a/docs/examples/basecoin/cmd/basecli/main.go
+++ b/docs/examples/basecoin/cmd/basecli/main.go
@@ -72,35 +72,34 @@ func main() {
 
 	// add query/post commands (custom to binary)
 	rootCmd.AddCommand(
-		client.GetCommands(
-			stakecmd.GetCmdQueryValidator(storeStake, cdc),
-			stakecmd.GetCmdQueryValidators(storeStake, cdc),
-			stakecmd.GetCmdQueryValidatorUnbondingDelegations(storeStake, cdc),
-			stakecmd.GetCmdQueryValidatorRedelegations(storeStake, cdc),
-			stakecmd.GetCmdQueryDelegation(storeStake, cdc),
-			stakecmd.GetCmdQueryDelegations(storeStake, cdc),
-			stakecmd.GetCmdQueryPool(storeStake, cdc),
-			stakecmd.GetCmdQueryParams(storeStake, cdc),
-			stakecmd.GetCmdQueryUnbondingDelegation(storeStake, cdc),
-			stakecmd.GetCmdQueryUnbondingDelegations(storeStake, cdc),
-			stakecmd.GetCmdQueryRedelegation(storeStake, cdc),
-			stakecmd.GetCmdQueryRedelegations(storeStake, cdc),
-			slashingcmd.GetCmdQuerySigningInfo(storeSlashing, cdc),
-			authcmd.GetAccountCmd(storeAcc, cdc),
-		)...)
+		stakecmd.GetCmdQueryValidator(storeStake, cdc),
+		stakecmd.GetCmdQueryValidators(storeStake, cdc),
+		stakecmd.GetCmdQueryValidatorUnbondingDelegations(storeStake, cdc),
+		stakecmd.GetCmdQueryValidatorRedelegations(storeStake, cdc),
+		stakecmd.GetCmdQueryDelegation(storeStake, cdc),
+		stakecmd.GetCmdQueryDelegations(storeStake, cdc),
+		stakecmd.GetCmdQueryPool(storeStake, cdc),
+		stakecmd.GetCmdQueryParams(storeStake, cdc),
+		stakecmd.GetCmdQueryUnbondingDelegation(storeStake, cdc),
+		stakecmd.GetCmdQueryUnbondingDelegations(storeStake, cdc),
+		stakecmd.GetCmdQueryRedelegation(storeStake, cdc),
+		stakecmd.GetCmdQueryRedelegations(storeStake, cdc),
+		slashingcmd.GetCmdQuerySigningInfo(storeSlashing, cdc),
+		stakecmd.GetCmdQueryValidatorDelegations(storeStake, cdc),
+		authcmd.GetAccountCmd(storeAcc, cdc),
+	)
 
 	rootCmd.AddCommand(
-		client.PostCommands(
-			bankcmd.SendTxCmd(cdc),
-			ibccmd.IBCTransferCmd(cdc),
-			ibccmd.IBCRelayCmd(cdc),
-			stakecmd.GetCmdCreateValidator(cdc),
-			stakecmd.GetCmdEditValidator(cdc),
-			stakecmd.GetCmdDelegate(cdc),
-			stakecmd.GetCmdUnbond(storeStake, cdc),
-			stakecmd.GetCmdRedelegate(storeStake, cdc),
-			slashingcmd.GetCmdUnjail(cdc),
-		)...)
+		bankcmd.SendTxCmd(cdc),
+		ibccmd.IBCTransferCmd(cdc),
+		ibccmd.IBCRelayCmd(cdc),
+		stakecmd.GetCmdCreateValidator(cdc),
+		stakecmd.GetCmdEditValidator(cdc),
+		stakecmd.GetCmdDelegate(cdc),
+		stakecmd.GetCmdUnbond(storeStake, cdc),
+		stakecmd.GetCmdRedelegate(storeStake, cdc),
+		slashingcmd.GetCmdUnjail(cdc),
+	)
 
 	// add proxy, version and key info
 	rootCmd.AddCommand(
diff --git a/docs/examples/democoin/cmd/democli/main.go b/docs/examples/democoin/cmd/democli/main.go
index 0c37d9bd0b..a001ee8b5f 100644
--- a/docs/examples/democoin/cmd/democli/main.go
+++ b/docs/examples/democoin/cmd/democli/main.go
@@ -70,13 +70,11 @@ func main() {
 	// add query/post commands (custom to binary)
 	// start with commands common to basecoin
 	rootCmd.AddCommand(
-		client.GetCommands(
-			authcmd.GetAccountCmd(storeAcc, cdc),
-		)...)
+		authcmd.GetAccountCmd(storeAcc, cdc),
+	)
 	rootCmd.AddCommand(
-		client.PostCommands(
-			bankcmd.SendTxCmd(cdc),
-		)...)
+		bankcmd.SendTxCmd(cdc),
+	)
 	rootCmd.AddCommand(
 		client.PostCommands(
 			simplestakingcmd.BondTxCmd(cdc),