UID bug fixed