Fixed a severe bug bug causing infinite folder creation