#2982 not flushing everything on new folder