Fixes #153 and #169

Merge request reports

Loading