Added disconnect handler for real