zeitgeist: make it work with current autofoo
virtuoso: make it work with current autofoo