Fix duplicate handling