Fixed UUID lookup bug