Fixed an issue in implementation of #360
Authored by: numere 2018-11-17
Parent: [r421]
Child: [r423]
