Removed uid check