Fixed KICK handling