Fix folder issue