Fix keyboard/cab bug