diff --git a/src/Unwind/AddressSpace.hpp b/src/Unwind/AddressSpace.hpp
index ceab016..283f14e 100644
--- a/src/Unwind/AddressSpace.hpp
+++ b/src/Unwind/AddressSpace.hpp
@@ -197,13 +197,13 @@
     break;
   case DW_EH_PE_sdata2:
     // Sign extend from signed 16-bit value.
-    result = (int16_t)get16(addr);
+    result = (pint_t)(int16_t)get16(addr);
     p += 2;
     addr = (pint_t) p;
     break;
   case DW_EH_PE_sdata4:
     // Sign extend from signed 32-bit value.
-    result = (int32_t)get32(addr);
+    result = (pint_t)(int32_t)get32(addr);
     p += 4;
     addr = (pint_t) p;
     break;