Tentative fix to findLink