Fix folder parsing