[bugfix] Make sure not to create a new instance of values, rather, use the underlying value