Resolved a small oversight resulting in a possible endless loop
Authored by: numere 2021-09-30
Parent: [r34]
Child: [r36]
