Fix #10 improve autocmd