fixed primary key issue