Cleared up ID conflicts