Fixed a sub issue.
Little different disconnect handling