fixed an issue on the connecting part