Should fix kicking in the initial stage