diff --git a/src/CalcViewModel/Common/TraceLogger.cpp b/src/CalcViewModel/Common/TraceLogger.cpp
index 087b42dc..17f719a0 100644
--- a/src/CalcViewModel/Common/TraceLogger.cpp
+++ b/src/CalcViewModel/Common/TraceLogger.cpp
@@ -156,7 +156,7 @@ namespace CalculatorApp
     }
 #pragma endregion
 
-    void TraceLogger::InsertIntoMemoryMap(int windowId, bool isScientific, bool isProgrammer)
+    void TraceLogger::InsertIntoMemoryMap(int windowId, bool isStandard, bool isScientific, bool isProgrammer)
     {
         // Writer lock for the static resources
         reader_writer_lock::scoped_lock lock(s_traceLoggerLock);
@@ -176,13 +176,13 @@ namespace CalculatorApp
         {
             iterMap->second.insert(iterMap->second.begin(), L"Programmer");
         }
-        else
+        else if (isStandard)
         {
             iterMap->second.insert(iterMap->second.begin(), L"Standard");
         }
     }
 
-    void TraceLogger::UpdateMemoryMap(int windowId, int memoryPosition, bool isScientific, bool isProgrammer)
+    void TraceLogger::UpdateMemoryMap(int windowId, int memoryPosition, bool isStandard, bool isScientific, bool isProgrammer)
     {
         // Writer lock for the static resources
         reader_writer_lock::scoped_lock lock(s_traceLoggerLock);
@@ -199,7 +199,7 @@ namespace CalculatorApp
         {
             iterMap->second[memoryPosition] = L"Programmer";
         }
-        else
+        else if (isStandard)
         {
             iterMap->second[memoryPosition] = L"Standard";
         }
diff --git a/src/CalcViewModel/Common/TraceLogger.h b/src/CalcViewModel/Common/TraceLogger.h
index e3b50ef6..b0213b2c 100644
--- a/src/CalcViewModel/Common/TraceLogger.h
+++ b/src/CalcViewModel/Common/TraceLogger.h
@@ -53,8 +53,8 @@ namespace CalculatorApp
         void LogModeChangeBegin(CalculatorApp::Common::ViewMode, CalculatorApp::Common::ViewMode, int);
         void LogModeChangeEnd(CalculatorApp::Common::ViewMode, int) const;
         void LogClearHistory() const;
-        void InsertIntoMemoryMap(int, bool, bool);
-        void UpdateMemoryMap(int, int, bool, bool);
+        void InsertIntoMemoryMap(int, bool, bool, bool);
+        void UpdateMemoryMap(int, int, bool, bool, bool);
         void DeleteFromMemoryMap(int, int);
         void LogMemoryUsed(int, unsigned int, bool, bool, bool, unsigned int) const;
         void LogMultipleMemoryUsed(unsigned int, unsigned int) const;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index b2ca9838..a25aeb18 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -1013,7 +1013,7 @@ void StandardCalculatorViewModel::OnMemoryButtonPressed()
     m_standardCalculatorManager.MemorizeNumber();
 
     int windowId = Utils::GetWindowId();
-    TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer);
+    TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
 
     String^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement(
         CalculatorResourceKeys::MemorySave,
@@ -1066,11 +1066,11 @@ void StandardCalculatorViewModel::OnMemoryAdd(Object^ memoryItemPosition)
         if (MemorizedNumbers->Size > 0)
         {
             TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size);
-            TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsScientific, IsProgrammer);
+            TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer);
         }
         else
         {
-            TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer);
+            TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
         }
         m_standardCalculatorManager.MemorizedNumberAdd(boxedPosition->Value);
     }
@@ -1087,11 +1087,11 @@ void StandardCalculatorViewModel::OnMemorySubtract(Object^ memoryItemPosition)
         if (MemorizedNumbers->Size > 0)
         {
             TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size);
-            TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsScientific, IsProgrammer);
+            TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer);
         }
         else
         {
-            TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer);
+            TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
         }
         m_standardCalculatorManager.MemorizedNumberSubtract(boxedPosition->Value);
     }