Fix #552

[nwlandry]

This fixes #552. I can't create an example where the prior implementation will create issues (there's a weird overlap of issues which leads to the correct behavior), but I think that this is more explainable.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.51%. Comparing base (bc90a38) to head (340162f).

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #561   +/-   ##
=======================================
  Coverage   92.51%   92.51%           
=======================================
  Files          59       59           
  Lines        4393     4393           
=======================================
  Hits         4064     4064           
  Misses        329      329           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[nwlandry]

@leotrs --- is this something you're able to review? (Same question for #562)