fix for uid support