UID problem improved