Some patches broke these commands in certain cases and were only
caught by manual testing.
Signed-off-by: NEric Wong <normalperson@yhbt.net>