Resolved an issue due to missing 'break's in implementation of ticket #471
Authored by: numere 2021-01-25
Parent: [r822]
Child: [r824]