Improved AO duplicate creation handling