Fixed: BNA key UIDs could be duplicated