Bugfix on arrow keys