Fixed keyboard return issue