Fix: still bugs on connect