Fix to keyboard change