Fixed concurrent and connect issue