BUG: Previous work had mangled output.