Don't modify connection object.
Closes #469