diff --git a/autoload/features/rename.vim b/autoload/features/rename.vim
index d16a979..3d24e6c 100644
--- a/autoload/features/rename.vim
+++ b/autoload/features/rename.vim
@@ -26,10 +26,14 @@ function! s:RenameImpl.run(data)
         endif
 
         if res.file != expand("%:p")
-            execute ":e " . expand("%:p")
+            execute ":e " . res.file
         endif
 
-        let left = getline(res.line)[0:res.col - 1]
+        if getline(res.line)[res.col] == '*'
+            let res.col -= len(res.name)
+        endif
+
+        let left = res.col != 0 ? getline(res.line)[0:res.col - 1] : ""
         let right = getline(res.line)[res.col + len(oldName):-1]
         call setline(res.line, left . newName . right)
     endfor
diff --git a/indent/nim.vim b/indent/nim.vim
index c526b02..e51d825 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -7,6 +7,8 @@ setlocal nolisp
 setlocal autoindent
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif
 setlocal indentexpr=NimIndent()
+setlocal foldmethod=indent
+setlocal foldexpr=NimIndent()
 
 function! Down()
     return indent(prevnonblank(v:lnum - 1)) - &tabstop