Fix no connection bug