- Fix dupe bug caused by SPIGOT-6452