Re: #1620 fix for multi-values