Fix bug where shift would be sent twice for now reason