Modify default-command a little