Fix two-value funcs