Bug fix folder creation issue