Fix up for AD use