diff --git a/mplane_client/CMakeLists.txt b/mplane_client/CMakeLists.txt
index ebf416d6..2be1aa18 100644
--- a/mplane_client/CMakeLists.txt
+++ b/mplane_client/CMakeLists.txt
@@ -61,7 +61,12 @@ target_link_libraries (${MPC_TESTER} ${MPC_LIBS})
 
 file (GLOB MPCLIENT_DEMO_SOURCES example/*.cpp)
 add_executable (${Target_mpclient_demo} ${MPCLIENT_DEMO_SOURCES} ${MPC_IF_SRC})
-target_link_libraries (${Target_mpclient_demo} ${Target_mpclient_client} ${MPC_LIBS})
+
+file (GLOB RPC_CLIENT_SOURCES test/rpc-client/*.cpp)
+target_sources (${Target_mpclient_demo} PRIVATE ${RPC_CLIENT_SOURCES})
+
+target_link_libraries (${Target_mpclient_demo} ${MPC_LIBS})
+
 
 # Copy test cases files when they are modified
 file (GLOB MPC_TESTS_CASES test/tests/cases/*)