Fix kicking