Fixing keyboard issue