Fix non unique spot entry