Waiting for peer fix and double disconnect fix
`