Fixed values not being escaped sometimes.