1873 - Made Starting/Stopping connections multiple times work

For #1873