fixed the key mapping