Fix the kick tables