Fixed an issue in implementation of ticket #789
Authored by: numere 2023-03-04
Parent: [r1349]
Child: [r1351]
