Finally fixed the kick bug