Fix keyboard issue