Fix kick behavior