fixed Kick issues