diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index a7566f449e..a5f88f975d 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -280,7 +280,7 @@ public class PlatformBuildFileGenerator {
             for(int j = 0; j < toolchainList.length; j++){
                 String fvOutputDir = project.getProperty("BUILD_DIR") + File.separatorChar 
                                         + targetList[i] + File.separatorChar 
-                                        + toolchainList[i] + File.separatorChar + "FV";
+                                        + toolchainList[j] + File.separatorChar + "FV";
                 String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();
                 for (int k = 0; k < validFv.length; k++) {
                     if (fvNameSet.contains(validFv[k]) || ! isListInSequence(validFv[k])) {