Fix kick kludge :/