diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index b46660c..b3722db 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -354,8 +354,7 @@ function! delimitMate#JumpOut(char) "{{{
 		return ' '.a:char.delimitMate#Del().delimitMate#Del()
 	elseif jump == 5
 		call delimitMate#FlushBuffer()
-		return "\<CR>" . matchstr(getline(line('.') + 1), '^\s*\S')
-					\ . delimitMate#Del() .  "\<Del>"
+		return "\<C-O>:exec \"normal! \\<CR>a\"\<CR>"
 	else
 		return a:char
 	endif
diff --git a/test/expand_cr.txt b/test/expand_cr.txt
index 1cfe41f..ffbb883 100644
--- a/test/expand_cr.txt
+++ b/test/expand_cr.txt
@@ -30,3 +30,15 @@ exec "normal i(  \<CR>\<BS>\<BS>x"
 ================================================================================
 (x)
 --------------------------------------------------------------------------------
+# Conflict with indentation settings (cindent). Issue #95
+se cindent
+call setline(1, ['sub foo {','    while (1) {', '        ', '    }', '}'])
+call cursor(3, 8)
+normal a}x
+================================================================================
+sub foo {
+    while (1) {
+        
+    }x
+}
+--------------------------------------------------------------------------------