Fix kick & world changing