Improved the implementation of ticket #601
- Resolved an issue detected during tests
Authored by: numere 2021-08-24
Parent: [r986]
Child: [r988]