diff --git a/Source/nragev20/XInputController.cpp b/Source/nragev20/XInputController.cpp
index 52b1bf3f1..4b66a5ab5 100644
--- a/Source/nragev20/XInputController.cpp
+++ b/Source/nragev20/XInputController.cpp
@@ -388,8 +388,7 @@ TCHAR * GetN64ButtonNameFromButtonCode( int Button )
 {
     using namespace N64_BUTTONS;
 
-    TCHAR *btnName;
-    btnName = new TCHAR[10];
+    static TCHAR btnName[10];
 
     switch( Button )
     {
@@ -444,10 +443,9 @@ TCHAR * GetN64ButtonArrayFromXAnalog( LPXCONTROLLER gController, int XThStickOrX
     using namespace N64_BUTTONS;
 
     if( !gController || !gController->bConfigured )
-        return NULL;
+        return _T("");
 
-    TCHAR *name;
-    name = new TCHAR[15];
+    static TCHAR name[15];
 
     switch( XThStickOrXDpad )
     {