Sorry, I didn't test the effects of merging 2 PRs

Conflicts:
	cmds.go