diff --git a/zencoding.vim b/zencoding.vim
index af0e789..d21560e 100644
--- a/zencoding.vim
+++ b/zencoding.vim
@@ -1,8 +1,8 @@
 "=============================================================================
 " File: zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 25-Feb-2010.
-" Version: 0.24
+" Last Change: 26-Feb-2010.
+" Version: 0.25
 " WebPage: http://github.com/mattn/zencoding-vim
 " Description: vim plugins for HTML and CSS hi-speed coding.
 " SeeAlso: http://code.google.com/p/zen-coding/
@@ -70,8 +70,8 @@ if exists('g:use_zen_complete_tag') && g:use_zen_complete_tag
   setlocal completefunc=ZenCompleteTag
 endif
 
-inoremap <plug>ZenCodingExpandAbbr   <esc>:call <sid>zen_expand(0)<cr>a
-inoremap <plug>ZenCodingExpandWord   <esc>:call <sid>zen_expand(1)<cr>a
+inoremap <plug>ZenCodingExpandAbbr   <c-g>u<esc>:call <sid>zen_expand(0)<cr>a
+inoremap <plug>ZenCodingExpandWord   <c-g>u<esc>:call <sid>zen_expand(1)<cr>a
 vnoremap <plug>ZenCodingExpandVisual :call <sid>zen_expand(2)<cr>
 
 if !exists('g:user_zen_expandword_key')
diff --git a/zencoding.vim.vimup b/zencoding.vim.vimup
index e1f8c88..972aeb5 100644
--- a/zencoding.vim.vimup
+++ b/zencoding.vim.vimup
@@ -2,7 +2,7 @@ script_name: ZenCoding.vim
 script_id: '2981'
 script_type: utility
 script_package: zencoding.vim
-script_version: '0.24'
+script_version: '0.25'
 required_vim_version: '7.0'
 summary: vim plugins for HTML and CSS hi-speed coding.
 
@@ -78,6 +78,8 @@ install_details: |
   copy zencoding.vim to your plugin directory.
 
 versions:
+- '0.25': |
+   This is an upgrade for ZenCoding.vim: store undo before working.
 - '0.24': |
    This is an upgrade for ZenCoding.vim: fixed behavior of parsing area of visual selection.
 - '0.23': |