diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
index da10095dda079428c83312127f993df6d827d79c..0471b13c3409a62bbd4a2dfab70850be8f7e3ec2 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
@@ -142,8 +142,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 
 			Completed = inputDataProvider.Completed ?? false;
-			StageInputPath = inputDataProvider.StageInputData?.DataSource?.SourcePath;
-			PrimaryInputPath = inputDataProvider.StageInputData?.DataSource?.SourcePath;
+			StageInputPath = inputDataProvider.StageInputData?.DataSource?.SourceFile;
+			PrimaryInputPath = inputDataProvider.PrimaryVehicle?.DataSource?.SourceFile;
 			DataSource = inputData.DataSource;
 			UpdateTitleAndDocumentName();
 		}
diff --git a/Vecto3GUI2020Test/ViewModelTests/CreateVifViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/CreateVifViewModelTests.cs
index d38a9cd8149b9866085b12ab804fb1f4d3905926..bef354ab424c31591b3f0ec3c69759250c27822f 100644
--- a/Vecto3GUI2020Test/ViewModelTests/CreateVifViewModelTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/CreateVifViewModelTests.cs
@@ -1,8 +1,11 @@
 using System.Diagnostics;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Ninject;
 using NUnit.Framework;
+using VECTO3GUI2020.ViewModel.Implementation;
+using VECTO3GUI2020.ViewModel.Interfaces;
 using VECTO3GUI2020.ViewModel.MultiStage.Implementation;
 
 namespace Vecto3GUI2020Test.ViewModelTests
@@ -168,5 +171,30 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			Assert.IsNull(_createVifViewModel.PrimaryInputPath);
 			Assert.IsNull(_createVifViewModel.IsPrimaryExempted);
 		}
+
+
+		[Test]
+		public async Task SaveAndReload()
+		{
+			LoadValidNonExemptedFiles();
+			var primaryPath = _createVifViewModel.PrimaryInputPath;
+			var stagePath = _createVifViewModel.StageInputPath;
+
+			var savedToPath = _createVifViewModel.SaveJob("non_exempted.json");
+			WriteLine($"Saved to: {savedToPath}");
+
+			Assert.AreEqual(primaryPath, _createVifViewModel.PrimaryInputPath);
+			Assert.AreEqual(stagePath, _createVifViewModel.StageInputPath);
+
+			var jobListVm = _kernel.Get<IJobListViewModel>() as JobListViewModel;
+			var loadedDoc = await jobListVm.AddJobAsync(savedToPath) as CreateVifViewModel;
+
+			Assert.AreEqual(stagePath, loadedDoc.StageInputPath);
+			Assert.AreEqual(primaryPath, loadedDoc.PrimaryInputPath);
+
+
+
+
+		}
 	}
 }
\ No newline at end of file