Fixed an issue in implementation of #363
Authored by: numere 2018-11-17
Parent: [r418]
Child: [r420]