FIXED issue of conflicting OIDs