diff --git a/producer/api/cpp/src/producer_c_glue.cpp b/producer/api/cpp/src/producer_c_glue.cpp
index ea7ed21581051b15a4153800f2514f551f31244c..abb22d35c8725d2535db08cb78835eea7ce91a6e 100644
--- a/producer/api/cpp/src/producer_c_glue.cpp
+++ b/producer/api/cpp/src/producer_c_glue.cpp
@@ -119,7 +119,7 @@ extern "C" {
                 dataset_size,
                 auto_id != 0));
     }
-    
+
 #define BUILD_WRAPPER asapo::RequestCallback wrapper = [ = ](asapo::RequestCallbackPayload payload, asapo::Error err) -> void { \
             void* data = (void*) payload.data.release(); \
             auto payLoadHandle = new AsapoHandlerHolder<asapo::RequestCallbackPayload>(&payload, false); \
diff --git a/tests/automatic/consumer/consumer_api/consumer_api.c b/tests/automatic/consumer/consumer_api/consumer_api.c
index 0ec0990021aa97fa665e1ec7770ed50ad13f687d..25fdbc65399b286ec1149ef7cf2d2f0abfab1b62 100644
--- a/tests/automatic/consumer/consumer_api/consumer_api.c
+++ b/tests/automatic/consumer/consumer_api/consumer_api.c
@@ -56,6 +56,7 @@ void test_datasets(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
     AsapoDataSetHandle ds = asapo_consumer_get_last_dataset(consumer, 0, "incomplete", &err);
     ASSERT_TRUE(ds == NULL,"returns null in case of error");
     ASSERT_TRUE(asapo_error_get_type(err) == kEndOfStream,"incomplete dataset end of stream error");
+    asapo_free_handle(&ds);
 
 // get dataset by id incomplete datasets without min_size
     dataset = asapo_consumer_get_dataset_by_id(consumer,2, 0,"incomplete", &err);
diff --git a/tests/automatic/producer/c_api/check_linux.sh b/tests/automatic/producer/c_api/check_linux.sh
index 4fcd7f3c729fa68fb847b9bf572d79f660ccb605..3830f771cf3abe31bf1fc077c0f0c61cf60a4b54 100644
--- a/tests/automatic/producer/c_api/check_linux.sh
+++ b/tests/automatic/producer/c_api/check_linux.sh
@@ -23,5 +23,4 @@ mkdir -p ${receiver_folder}
 
 echo test > file1
 
-#$@ 127.0.0.1:8400 $data_source $beamtime_id
-/Users/yakubov/Projects/asapo/cmake-build-debug/tests/automatic/producer/c_api/producer_api_c  127.0.0.1:8400 c asapo_test
+$@ 127.0.0.1:8400 $data_source $beamtime_id
diff --git a/tests/automatic/producer/c_api/producer_api.c b/tests/automatic/producer/c_api/producer_api.c
index fe88def56070c58403ce6f4ea6007293dea51b79..f5822e68d228bf2f375b8d965ca04dca3b13c660 100644
--- a/tests/automatic/producer/c_api/producer_api.c
+++ b/tests/automatic/producer/c_api/producer_api.c
@@ -7,14 +7,14 @@
 
 void callback(void* original_data, AsapoRequestCallbackPayloadHandle payload, AsapoErrorHandle error) {
     EXIT_IF_ERROR("error after callback", error);
-    AsapoMessageDataHandle data_handle = asapo_request_callback_payload_get_data(payload);
     AsapoStringHandle response = asapo_request_callback_payload_get_response(payload);
     const struct AsapoGenericRequestHeader* header = asapo_request_callback_payload_get_original_header(payload);
 
     ASSERT_EQ_INT(1,header->data_id,"data id");
     ASSERT_EQ_STRING("hello",(const char*)original_data,"data in payload");
 
-    asapo_free_handle(&data_handle);
+    free(original_data);
+
     asapo_free_handle(&response);
 }