Bug fix to prevent dupes