Handle KICK correctly (take 3)

As per request in #226, making a PR into development.