More fixes for #58

Merge request reports

Loading