Fix movement keys for Issue #315