diff --git a/irdb-libs/libIRDB-util/src/registers.cpp b/irdb-libs/libIRDB-util/src/registers.cpp
index 8239122ba74778120463d7d536cadd2775aa16fc..942d2b1e569b9807cd4a40195137922147917605 100644
--- a/irdb-libs/libIRDB-util/src/registers.cpp
+++ b/irdb-libs/libIRDB-util/src/registers.cpp
@@ -411,18 +411,18 @@ RegisterID_t IRDB_SDK::convertRegisterTo16bit(const RegisterID_t p_reg)
 		case rn_RBX: case  rn_EBX:  case rn_BH: case rn_BL:  return rn_BX;
 		case rn_RCX: case  rn_ECX:  case rn_CH: case rn_CL:  return rn_CX;
 		case rn_RDX: case  rn_EDX:  case rn_DH: case rn_DL:  return rn_DX;
-		case rn_RBP: case  rn_EBP:  return rn_BP;
-		case rn_RSP: case  rn_ESP:  return rn_SP;
-		case rn_RSI: case  rn_ESI:  case rn_SIH: case rn_SIL:  return rn_SI;
-		case rn_RDI: case  rn_EDI:  case rn_DIH: case rn_DIL:  return rn_DI;
-		case  rn_R8: case  rn_R8D:   return rn_R8W;
-		case  rn_R9: case  rn_R9D:   return rn_R9W;
-		case rn_R10: case rn_R10D:   return rn_R10W;
-		case rn_R11: case rn_R11D:   return rn_R11W;
-		case rn_R12: case rn_R12D:   return rn_R12W;
-		case rn_R13: case rn_R13D:   return rn_R13W;
-		case rn_R14: case rn_R14D:   return rn_R14W;
-		case rn_R15: case rn_R15D:   return rn_R15W;
+		case rn_RBP: case  rn_EBP:  case rn_BPL: return rn_BP;
+		case rn_RSP: case  rn_ESP:  case rn_SPL: return rn_SP;
+		case rn_RSI: case  rn_ESI:  case rn_SIL: return rn_SI;
+		case rn_RDI: case  rn_EDI:  case rn_DIL: return rn_DI;
+		case  rn_R8: case  rn_R8D:  case  rn_R8B: return rn_R8W;
+		case  rn_R9: case  rn_R9D:  case  rn_R9B: return rn_R9W;
+		case rn_R10: case rn_R10D:  case rn_R10B: return rn_R10W;
+		case rn_R11: case rn_R11D:  case rn_R11B: return rn_R11W;
+		case rn_R12: case rn_R12D:  case rn_R12B: return rn_R12W;
+		case rn_R13: case rn_R13D:  case rn_R13B: return rn_R13W;
+		case rn_R14: case rn_R14D:  case rn_R14B: return rn_R14W;
+		case rn_R15: case rn_R15D:  case rn_R15B: return rn_R15W;
 		default:
 			return rn_UNKNOWN;
 			break;