* Fixes reconnect issues with smith in client situation.

@mostafaeweda @fjakobs @lennartcl