Cannot use <SPC> in motion mode, when <SPC> is a leader key

My leader key is assigned to <SPC>.

  (evil-leader/set-leader "<SPC>")
  (global-evil-leader-mode)

But now I cannot use <SPC> in motion mode, in particular:

d<SPC> to delete one letter under cursor;
c<SPC> to delete one letter under cursor and enter insert mode.

Obviously the following line "causes" my problem.

(if evil-leader-mode
    (progn
      (evil-normalize-keymaps)
      (define-key evil-motion-state-local-map no-prefix map)   <---------

I assume you cannot simply move the mapping for motion state under evil-leader/in-all-states without breaking many current configurations, but perhaps it is possible to create another parameter to control motion state, enabled by default?

UPDATE: Apparently, without this line leader key will not work in visual state. So need to find a better solution, rather than the workaround I proposed above.

cofi / evil-leader

Cannot use <SPC> in motion mode, when <SPC> is a leader key #21