Fixed an issue in implementation of ticket #320
Placeholders are now detected correctly.
Authored by: numere 2019-08-23
Parent: [r616]
Child: [r618]
