Stopped auto-commands executing twice