Fix UID override bug