(#1549) - ensure consistent value encoding