fixup connection issue
Tie things up