fix defects - add uid

fix defects - add uid