Fixed an issue with the implementation of ticket #216
Authored by: numere 2017-08-23
Parent: [r193]
Child: [r195]
