Fix uses cmd

Fixes #17074.
Closes #17075.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>