bug fix
move event handle duplicated