Fixed a little issue in implementation of ticket #430
Authored by: numere 2019-03-12
Parent: [r496]
Child: [r498]
