Fixed bug with multiple values