Fixing bad folder creation again