Jrb/delete folder fix