Workaround for disconnects