Fixed an issue in #257
Changed the order of the string ternary evaluation and the concatenation
Authored by: numere 2018-05-02
Parent: [r319]
Child: [r321]