#58 Fix for reconnection