fix connection_handler