Finally fixing the empty folder issue