Uncomment uid check