Fix UID bug