#9 some good fixes connected with Disconnect Scenario