Fix issue #295 and prevent infinity loop

Merge request reports

Loading