Remove use of keyboard
Fix unsequenced access issue