diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 11942b9cb5ce3ebd92d37872145ebee1f09a5c9d..7c6d9a04b4bdf7a24f8f078de466434c97b21185 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -44,12 +44,12 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
         storageDirectory = uploadInfo['storageDirectory']
         dataDirectory = uploadInfo['dataDirectory']
         self.logger.debug('Upload info: %s', uploadInfo)
-        # Storage directory may contain host/port
-        (scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageDirectory)
+        # Original data directory may contain host/port
+        (scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory)
         ftpUtility = SftpUtility(storageHost)
         self.logger.debug("STORAGE DIR: %s", storageDirectory)
         self.logger.debug("STORAGE HOST: %s", storageHost)
-        storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, storageDirPath)
+        storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, replacementDirPath)
         self.logger.debug("STORAGE PATHS: %s", storageFilePathsDict)
         self.logger.debug("ORIG PATHS: %s", filePathsDict)
         pluginFilePathsDict = {}