Fix critical dupe issue