Fixed: Issue with location of setting the ID.