Added better handling when values is not string