5323: avoid duplicate key error