QUICKFIX - allow fields to be a function