Fix regression on kick messages
Merge pull request #466 from CoryChaplin/fixes

Fix regression on kick messages