correct connect/disconnect issue