Fixing a new duping bug. And this time it was NOT our fault!