diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index 63626dc..1402c88 100644
--- a/autoload/neosnippet.vim
+++ b/autoload/neosnippet.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: neosnippet.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 30 Oct 2012.
+" Last Modified: 31 Oct 2012.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -582,9 +582,9 @@ function! neosnippet#expand(cur_text, col, trigger_name)"{{{
       call append('.', snippet_lines[1:])
     endif
 
-    call s:indent_snippet(
-          \ ((begin_line != end_line || snippet.options.indent) ?
-          \  begin_line : begin_line + 1), end_line)
+    if begin_line != end_line || snippet.options.indent
+      call s:indent_snippet(begin_line, end_line)
+    endif
 
     let begin_patterns = (begin_line > 1) ?
           \ [getline(begin_line - 1)] : []
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index 3a011da..2ef8896 100644
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -617,6 +617,9 @@ Note: But you must unmap in select mode mappings manually.
 ==============================================================================
 CHANGELOG			*neosnippet-changelog*
 
+2012-10-31
+- Improved indent_snippet().
+
 2012-10-30
 - Implemented commented placeholder.
 - Improved python snippets.