Fixing multiple dirs scnaning duplication problems