Don't disconnect before connecting

Kind of a hack, but it closes #87