diff --git a/source/client/udaClient.cpp b/source/client/udaClient.cpp
index 8169b0ce..64b984c1 100755
--- a/source/client/udaClient.cpp
+++ b/source/client/udaClient.cpp
@@ -1042,6 +1042,8 @@ int idamClient(REQUEST_BLOCK* request_block, int* indices)
             }
 
             printDataBlock(*data_block);
+            data_received = true;
+            data_block_indices[i] = data_block_idx;
         }
 
 #endif      // <========================== End of FatClient Code Only
diff --git a/source/wrappers/python/setup.py.in b/source/wrappers/python/setup.py.in
index 2c4da60c..e865cbc2 100644
--- a/source/wrappers/python/setup.py.in
+++ b/source/wrappers/python/setup.py.in
@@ -36,7 +36,8 @@ if build_fat:
         'libfat@PROJECT_NAME@_client.' + stalib_ext,
         'lib@PROJECT_NAME@_plugins.' + stalib_ext,
     ] + ['lib@PROJECT_NAME@_' + name + '.' + stalib_ext for name in uda_lib_names]
-    extra_libs = ['xml2', 'pq']
+    extra_libs = ['xml2']
+    extra_libs.extend('@EXTRA_LIBS@'.split(';') if '@EXTRA_LIBS@' else [])
     extra_macros = [('FATCLIENT', None)]
 else:
     uda_libs = [