Fixed an issue in implementation of #377
Authored by: numere 2018-11-15
Parent: [r417]
Child: [r419]
