Fix bug around resetting behavior post-kick