Fix: Always flatten values