Solve keyboard issue