Tentative fix for the folder numbering issue