One more fix for empty UID