Fixed issue in implementation of ticket #444
Authored by: numere 2019-02-21
Parent: [r475]
Child: [r477]
