Fixed and tweaked double finding.