Attempt to fix keyscan issue again