Fixed find by name