Index: src/libchcore/TSubTaskFastMove.cpp
===================================================================
diff -u -N -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -r7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d
--- src/libchcore/TSubTaskFastMove.cpp	(.../TSubTaskFastMove.cpp)	(revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01)
+++ src/libchcore/TSubTaskFastMove.cpp	(.../TSubTaskFastMove.cpp)	(revision 7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d)
@@ -40,6 +40,7 @@
 #include "TFileException.h"
 #include "TFilesystemFeedbackWrapper.h"
 #include "log.h"
+#include "TDestinationPathProvider.h"
 
 namespace chcore
 {
@@ -111,6 +112,11 @@
 		if (bIgnoreDirs || bForceDirectories)
 			return eSubResult_Continue;
 
+		TDestinationPathProvider tDstPathProvider(spFilesystem, pathDestination,
+			bIgnoreDirs, bForceDirectories,
+			GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(GetContext().GetConfig()),
+			GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(GetContext().GetConfig()));
+
 		// add everything
 		TString strFormat;
 
@@ -153,7 +159,7 @@
 			}
 
 			// try to fast move
-			eResult = tFilesystemFBWrapper.FastMoveFB(spFileInfo, CalculateDestinationPath(spFileInfo, pathDestination, 0), spBasePath, bSkip);
+			eResult = tFilesystemFBWrapper.FastMoveFB(spFileInfo, tDstPathProvider.CalculateDestinationPath(spFileInfo), spBasePath, bSkip);
 			if (eResult != TSubTaskBase::eSubResult_Continue)
 				return eResult;
 			//else if (bSkip)