diff --git a/SPIRV/disassemble.cpp b/SPIRV/disassemble.cpp
index b2d30bec..d334375e 100755
--- a/SPIRV/disassemble.cpp
+++ b/SPIRV/disassemble.cpp
@@ -568,6 +568,7 @@ void GLSLstd450GetDebugNames(const char** names)
 void Disassemble(std::ostream& out, const std::vector<unsigned int>& stream)
 {
     SpirvStream SpirvStream(out, stream);
+    spv::Parameterize();
     GLSLstd450GetDebugNames(GlslStd450DebugNames);
     SpirvStream.validate();
     SpirvStream.processInstructions();
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 3c54d4f9..b6554906 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -753,7 +753,6 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
                     if (! (Options & EOptionMemoryLeakMode)) {
                         glslang::OutputSpv(spirv, GetBinaryName((EShLanguage)stage));
                         if (Options & EOptionHumanReadableSpv) {
-                            spv::Parameterize();
                             spv::Disassemble(std::cout, spirv);
                         }
                     }