be more strict about returned UIDs.