:uid extraction fix