Fixed empty folder bug