fix keybord handling