Fix disconnect method