Fix plan duplicates