diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index 1644b0084247eaa3d7c51d6e5eb4f4e0ca444545..d97061997d704eea1f1cfea5bd90ffa9efaf6dec 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -1830,6 +1830,9 @@ def Tcbuild(cmd, *args, sdid=0, ack=None, no_check=False, hack_value=None, sourc
     if npars == 0:
         pdata = b''
 
+        if source_data_only:
+            return pdata
+
     else:
         # check for padded parameters
         padded, = np.where(np.array([i[5] for i in params]) == 'A')
@@ -1876,6 +1879,9 @@ def Tcbuild(cmd, *args, sdid=0, ack=None, no_check=False, hack_value=None, sourc
 
             pdata = fix + var + fix2
 
+            if source_data_only:
+                return pdata
+
         else:
             if hack_value is None:
                 values = [tc_param_alias(p[-1], v, no_check=no_check) for p, v in zip_no_pad(params, args)]