fixing kicker edge cases