collapseVals behavior improved