Fixed warning.
Fixed cases with multiple values.