diff --git a/browser/browser.c b/browser/browser.c
index ddeabfa..e8dae9b 100644
--- a/browser/browser.c
+++ b/browser/browser.c
@@ -680,7 +680,7 @@ char* Browser(int files_too, int menu_id, int filtered) {
 
 			gsKit_clear(gsGlobal, GS_SETREG_RGBAQ(0x00,0x00,0x00,0x80,0x00));
 
-			browser_primitive("PSMS Reloaded New v0.6.2", "Browser", &BG_TEX,
+			browser_primitive("PSMS Reloaded New v0.6.3", "Browser", &BG_TEX,
 					menu_x1, menu_y1, menu_x2, menu_y2);
 
 			for (i=0; i<n; i++) { //display list
diff --git a/sms.c b/sms.c
index e2f329d..391c871 100644
--- a/sms.c
+++ b/sms.c
@@ -228,8 +228,8 @@ int cpu_readport(int port)
             if(input.pad[0] & INPUT_DOWN)    temp &= ~0x02;
             if(input.pad[0] & INPUT_LEFT)    temp &= ~0x04;
             if(input.pad[0] & INPUT_RIGHT)   temp &= ~0x08;
-            if(input.pad[0] & INPUT_BUTTON2) temp &= ~0x10;
-            if(input.pad[0] & INPUT_BUTTON1) temp &= ~0x20;
+            if(input.pad[0] & INPUT_BUTTON1) temp &= ~0x10;
+            if(input.pad[0] & INPUT_BUTTON2) temp &= ~0x20;
             if(input.pad[1] & INPUT_UP)      temp &= ~0x40;
             if(input.pad[1] & INPUT_DOWN)    temp &= ~0x80;
             return (temp);
@@ -239,8 +239,8 @@ int cpu_readport(int port)
             temp = 0xFF;
             if(input.pad[1] & INPUT_LEFT)    temp &= ~0x01;
             if(input.pad[1] & INPUT_RIGHT)   temp &= ~0x02;
-            if(input.pad[1] & INPUT_BUTTON2) temp &= ~0x04;
-            if(input.pad[1] & INPUT_BUTTON1) temp &= ~0x08;
+            if(input.pad[1] & INPUT_BUTTON1) temp &= ~0x04;
+            if(input.pad[1] & INPUT_BUTTON2) temp &= ~0x08;
             if(input.system & INPUT_SOFT_RESET) temp &= ~0x10;
             return ((temp & 0x3F) | (sms.port_3F & 0xC0));
 
diff --git a/system.h b/system.h
index ec7334a..299986b 100644
--- a/system.h
+++ b/system.h
@@ -26,8 +26,8 @@
 #define INPUT_DOWN        (0x00000002)
 #define INPUT_LEFT        (0x00000004)
 #define INPUT_RIGHT       (0x00000008)
-#define INPUT_BUTTON2     (0x00000010)
-#define INPUT_BUTTON1     (0x00000020)
+#define INPUT_BUTTON1     (0x00000010)
+#define INPUT_BUTTON2     (0x00000020)
 
 /* These can be used for 'input.system' */
 #define INPUT_START       (0x00000001)    /* Game Gear only */