Better directory handling after the fit pull all