Fixed auto-command