fix for #40

Kostis Trantzasrequested to merge
cherry-pick-888ca64b into 2024Q2_RC

(cherry picked from commit 888ca64b)

Merge request reports