Fixed an issue in implementation of ticket #400
Authored by: numere 2018-11-27
Parent: [r431]
Child: [r433]