diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index f45e9afa2..bc18ced4b 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -554,7 +554,7 @@ int http_fn_index(http_request_t* request) {
 	{
 		for (i = 0;i < 29;i++)
 		{
-			if ((PIN_GetPinRoleForPinIndex(i) == IOR_None) && (i != 10) && (i != 11))
+			if (PIN_GetPinRoleForPinIndex(i) == IOR_None)
 			{
 				HAL_PIN_Setup_Input(i);
 			}
@@ -563,7 +563,7 @@ int http_fn_index(http_request_t* request) {
 		hprintf255(request, "<h5> PIN States<br>");
 		for (i = 0;i < 29;i++)
 		{
-			if ((PIN_GetPinRoleForPinIndex(i) != IOR_None) || (i == 10) || (i == 11))
+			if (PIN_GetPinRoleForPinIndex(i) != IOR_None)
 			{
 				hprintf255(request, "P%02i: NA ", i);
 			}
diff --git a/src/new_pins.c b/src/new_pins.c
index 26dedfec4..dbb6682b4 100644
--- a/src/new_pins.c
+++ b/src/new_pins.c
@@ -258,7 +258,7 @@ static uint8_t PIN_ReadDigitalInputValue_WithInversionIncluded(int index) {
 
 	// support inverted button
 	if(BTN_ShouldInvert(index)) {
-		return !iVal;
+		return (iVal==0) ? 1 : 0;
 	}
 	return iVal;
 }
@@ -446,7 +446,7 @@ void PIN_SetPinRoleForPinIndex(int index, int role) {
 		{
 		case IOR_Button:
 		case IOR_Button_n:
-		case IOR_Button_ToggleAll:
+        case IOR_Button_ToggleAll:
 		case IOR_Button_ToggleAll_n:
 		case IOR_Button_NextColor:
 		case IOR_Button_NextColor_n:
@@ -459,7 +459,7 @@ void PIN_SetPinRoleForPinIndex(int index, int role) {
 				HAL_PIN_Setup_Input_Pullup(index);
 
 				// init button after initializing pin role
-				NEW_button_init(bt, button_generic_get_gpio_value, 0);
+				NEW_button_init(bt, button_generic_get_gpio_value, 1);
 			}
 			break;
 		case IOR_ToggleChannelOnToggle: