macro fix: leaking symbols II