Fixed an issue in implementation of #401
Authored by: numere 2018-12-01
Parent: [r437]
Child: [r439]
