Handle KICK correctly

Fixes issue #224