Add preventDefault
merge issues