diff --git a/autoload/EasyMotion.vim b/autoload/EasyMotion.vim
index c9697b1..b3675e7 100644
--- a/autoload/EasyMotion.vim
+++ b/autoload/EasyMotion.vim
@@ -313,9 +313,10 @@ function! EasyMotion#SelectPhraseDelete() "{{{
 	endif
 endfunction "}}}
 " -- User Motion -------------------------
-function! EasyMotion#User(pattern, visualmode, direction) " {{{
+function! EasyMotion#User(pattern, mode, direction) " {{{
+	let visualmode =  match('\v([Vv])|(C-v)', a:mode) > 0 ? visualmode() : ''
 	let re = escape(a:pattern, '|')
-	call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', mode(1))
+	call s:EasyMotion(re, a:direction, visualmode, a:mode)
 endfunction " }}}
 function! EasyMotion#UserMapping(re, mapping, direction) " {{{
 	silent exec "nnoremap ".a:mapping." :call EasyMotion#User('".a:re."', 0, ".a:direction.")<CR>"
diff --git a/plugin/EasyMotion.vim b/plugin/EasyMotion.vim
index 1e8916d..47290a5 100644
--- a/plugin/EasyMotion.vim
+++ b/plugin/EasyMotion.vim
@@ -101,36 +101,25 @@ augroup end
 
 " -- Find Motion {{{
 " F: {{{
-noremap <silent><expr><Plug>(easymotion-s)
-    \      ':<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,2)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-s)
-    \ '<Esc>:<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,2)<CR>'
-noremap <silent><expr><Plug>(easymotion-f)
-    \      ':<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,0)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-f)
-    \ '<Esc>:<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,0)<CR>'
-noremap <silent><expr><Plug>(easymotion-F)
-    \      ':<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,1)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-F)
-    \ '<Esc>:<C-u>call EasyMotion#S(1, "' . EasyMotion#helper#mode(1) . '" ,1)<CR>'
+" (cound, visual, direction)
+noremap  <silent><Plug>(easymotion-f)      :<C-u>call EasyMotion#S(1,0,0)<CR>
+xnoremap <silent><Plug>(easymotion-f) <ESC>:<C-u>call EasyMotion#S(1,1,0)<CR>
+noremap  <silent><Plug>(easymotion-F)      :<C-u>call EasyMotion#S(1,0,1)<CR>
+xnoremap <silent><Plug>(easymotion-F) <ESC>:<C-u>call EasyMotion#S(1,1,1)<CR>
+noremap  <silent><Plug>(easymotion-s)      :<C-u>call EasyMotion#S(1,0,2)<CR>
+xnoremap <silent><Plug>(easymotion-s) <ESC>:<C-u>call EasyMotion#S(1,1,2)<CR>
 "}}}
 
 " T: {{{
-noremap <silent><expr><Plug>(easymotion-t)
-    \      ':<C-u>call EasyMotion#T(1, "' . EasyMotion#helper#mode(1) . '" ,0)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-t)
-    \ '<Esc>:<C-u>call EasyMotion#T(1, "' . EasyMotion#helper#mode(1) . '" ,0)<CR>'
-noremap <silent><expr><Plug>(easymotion-T)
-    \      ':<C-u>call EasyMotion#T(1, "' . EasyMotion#helper#mode(1) . '" ,1)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-T)
-    \ '<Esc>:<C-u>call EasyMotion#T(1, "' . EasyMotion#helper#mode(1) . '" ,1)<CR>'
+noremap  <silent><Plug>(easymotion-t)      :<C-u>call EasyMotion#T(1,0,0)<CR>
+xnoremap <silent><Plug>(easymotion-t) <ESC>:<C-u>call EasyMotion#T(1,1,0)<CR>
+noremap  <silent><Plug>(easymotion-T)      :<C-u>call EasyMotion#T(1,0,1)<CR>
+xnoremap <silent><Plug>(easymotion-T) <ESC>:<C-u>call EasyMotion#T(1,1,1)<CR>
 "}}}
 
 " Multi: {{{
-noremap <silent><expr><Plug>(easymotion-s2)
-    \      ':<C-u>call EasyMotion#S(2, "' . EasyMotion#helper#mode(1) . '" ,2)<CR>'
-xnoremap <silent><expr><Plug>(easymotion-s)
-    \ '<Esc>:<C-u>call EasyMotion#S(2, "' . EasyMotion#helper#mode(1) . '" ,2)<CR>'
+noremap  <silent><Plug>(easymotion-s2)      :<C-u>call EasyMotion#S(2,0,2)<CR>
+xnoremap <silent><Plug>(easymotion-s2) <Esc>:<C-u>call EasyMotion#S(2,1,2)<CR>
 "}}}
 "}}}
 
@@ -213,7 +202,6 @@ xnoremap <silent><Plug>(easymotion-repeat)
 
 " -- Line Motion {{{
 " F Line: {{{
-" (cound, visual, direction)
 noremap  <silent><Plug>(easymotion-fl)      :<C-u>call EasyMotion#SL(1,0,0)<CR>
 xnoremap <silent><Plug>(easymotion-fl) <Esc>:<C-u>call EasyMotion#SL(1,1,0)<CR>
 noremap  <silent><Plug>(easymotion-Fl)      :<C-u>call EasyMotion#SL(1,0,1)<CR>
@@ -223,7 +211,6 @@ xnoremap <silent><Plug>(easymotion-sl) <Esc>:<C-u>call EasyMotion#SL(1,1,2)<CR>
 "}}}
 
 " T Line: {{{
-" (cound, visual, direction)
 noremap  <silent><Plug>(easymotion-tl)      :<C-u>call EasyMotion#TL(1,0,0)<CR>
 xnoremap <silent><Plug>(easymotion-tl) <Esc>:<C-u>call EasyMotion#TL(1,1,0)<CR>
 noremap  <silent><Plug>(easymotion-Tl)      :<C-u>call EasyMotion#TL(1,0,1)<CR>