diff --git a/migration.py b/migration.py
index b08096a..6ce3893 100644
--- a/migration.py
+++ b/migration.py
@@ -40,6 +40,7 @@ def startmigration():
     for streamuuid in streamuuids:
         streamname = config.streamnames[streamuuids.index(streamuuid)]
         git.branch(streamname)
+        rtcworkspace.setnewflowtargets(streamuuid)
         componentbaselineentries = rtc.getcomponentbaselineentriesfromstream(streamuuid)
         rtc.acceptchangesintoworkspace(rtc.getchangeentriesofstreamcomponents(componentbaselineentries))
         shouter.shout("All changes of components of stream '%s' accepted" % streamname)
diff --git a/rtcFunctions.py b/rtcFunctions.py
index 616e324..9809dce 100644
--- a/rtcFunctions.py
+++ b/rtcFunctions.py
@@ -48,8 +48,7 @@ def setcomponentstobaseline(self, componentbaselineentries, streamuuid):
             shell.execute(replacecommand)
 
     def setnewflowtargets(self, streamuuid):
-        shouter.shout("Replacing Flowtargets")
-        self.removedefaultflowtarget()
+        shouter.shout("Set new Flowtargets")
         shell.execute("lscm add flowtarget -r %s %s %s"
                       % (self.repo, self.workspace, streamuuid))
         shell.execute("lscm set flowtarget -r %s %s --default --current %s"