Fixed issue in implementation of #326
Added check for strings
Authored by: numere 2018-05-07
Parent: [r326]
Child: [r328]