Refactoring seems to work
Saving before CrossValidation