short-term fix for the 2-level deep pass of keyvals