Fixing double qualified folders