fixed connect problem
merged fixed