Fix multiple dirs containing bundles