diff --git a/Platform/AptioInputFix/Keycode/AIKTranslate.c b/Platform/AptioInputFix/Keycode/AIKTranslate.c
index 2f32740..f0f3a22 100644
--- a/Platform/AptioInputFix/Keycode/AIKTranslate.c
+++ b/Platform/AptioInputFix/Keycode/AIKTranslate.c
@@ -35,9 +35,9 @@ AIKTranslateModifiers (
   //
   // Handle EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL Shift support, which is not included
   // in KeyShiftState on APTIO and VMware.
+  // UPD: Recent APTIO V also does not include it in its own protocol.
   //
-  if ((KeyShiftState & EFI_SHIFT_STATE_VALID) && KeyData->PS2ScanCodeIsValid == 0
-    && KeyData->Key.UnicodeChar < AIK_MAX_EFIKEY_NUM) {
+  if ((KeyShiftState & EFI_SHIFT_STATE_VALID) && KeyData->Key.UnicodeChar < AIK_MAX_EFIKEY_NUM) {
     KeyShiftState |= gAikAsciiToUsbMap[KeyData->Key.UnicodeChar].ShiftState;
   }
 
@@ -192,7 +192,7 @@ AIKTranslate (
     DEBUG ((EFI_D_ERROR, "\nAIKTranslate P1 MOD %a APPLE 0x%X (%a) PS2 0x%X Ps2Name %a\n",
       AIK_MODIFIERS_TO_NAME (*Modifiers), *Key, AIK_APPLEKEY_TO_NAME (*Key),
       KeyData->PS2ScanCode, AIK_PS2KEY_TO_NAME (KeyData->PS2ScanCode, *Modifiers)));
-    DEBUG ((EFI_D_ERROR, "AIKTranslate P2 AsciiName %a ScanName %a EfiKey %a Scan 0x%XUni 0x%X SState 0x%X\n",
+    DEBUG ((EFI_D_ERROR, "AIKTranslate P2 AsciiName %a ScanName %a EfiKey %a Scan 0x%X Uni 0x%X SState 0x%X\n",
       AIK_ASCII_TO_NAME (KeyData->Key.UnicodeChar), AIK_SCANCODE_TO_NAME (KeyData->Key.ScanCode),
       AIK_EFIKEY_TO_NAME (KeyData->EfiKey), KeyData->Key.ScanCode, KeyData->Key.UnicodeChar, KeyData->KeyState.KeyShiftState));
   }