Fixed nested folder issue