Nicer workaround for empty folder