Fix #22

Merged Edgar Onghena requested to merge fix-22 into main

Merge request reports