bug fixing on key combination handling