Update to latest fn.trace