Fixed auto disconnect