Fix kicker bug