solving prevent default keys problem
merge with last commit