Partial fix of problems b/c keydown move