Fix kick bug