Add fix for dst even to find