Fix silly duplication popup