Fix UID problem