diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java b/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java
index 7fd8a11f13..372177ca91 100644
--- a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java
+++ b/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java
@@ -34,7 +34,10 @@ public class VirtualModelImpl implements InternalVirtualModel {
 	private final ViewTypeProvider viewTypeRepository;
 	private final VsumFileSystemLayout fileSystemLayout;
 	private final List<ChangePropagationListener> changePropagationListeners = new LinkedList<>();
-	private final ChangePropagator changePropagator;
+
+	private final ChangePropagationSpecificationProvider changePropagationSpecificationProvider;
+	private final InternalUserInteractor userInteractor;
+	private ChangePropagationMode changePropagationMode = ChangePropagationMode.TRANSITIVE_CYCLIC;
 
 	public VirtualModelImpl(VsumFileSystemLayout fileSystemLayout, InternalUserInteractor userInteractor,
 			ViewTypeRepository viewTypeRepository,
@@ -42,8 +45,9 @@ public VirtualModelImpl(VsumFileSystemLayout fileSystemLayout, InternalUserInter
 		this.fileSystemLayout = fileSystemLayout;
 		this.viewTypeRepository = viewTypeRepository;
 		resourceRepository = new ResourceRepositoryImpl(fileSystemLayout);
-		changePropagator = new ChangePropagator(resourceRepository, changePropagationSpecificationProvider,
-				userInteractor);
+
+		this.changePropagationSpecificationProvider = changePropagationSpecificationProvider;
+		this.userInteractor = userInteractor;
 	}
 
 	public void loadExistingModels() {
@@ -74,6 +78,8 @@ public synchronized List<PropagatedChange> propagateChange(VitruviusChange chang
 		LOGGER.info("Starting change propagation");
 		startChangePropagation(unresolvedChange);
 
+		ChangePropagator changePropagator = new ChangePropagator(resourceRepository,
+				changePropagationSpecificationProvider, userInteractor, changePropagationMode);
 		List<PropagatedChange> result = changePropagator.propagateChange(unresolvedChange);
 		save();
 
@@ -166,6 +172,6 @@ public <S extends ViewSelector> S createSelector(ViewType<S> viewType) {
 
 	@Override
 	public void setChangePropagationMode(ChangePropagationMode changePropagationMode) {
-		changePropagator.setChangePropagationMode(changePropagationMode);
+		this.changePropagationMode = changePropagationMode;
 	}
 }