plural unique keys hot fix