Use correct finder method