Fixed not correctly parsing folder name