diff --git a/src/apps/debugger/dwarf/CfaContext.cpp b/src/apps/debugger/dwarf/CfaContext.cpp
index 6205ad0a0d..d4d13a111e 100644
--- a/src/apps/debugger/dwarf/CfaContext.cpp
+++ b/src/apps/debugger/dwarf/CfaContext.cpp
@@ -9,11 +9,10 @@
 #include "CfaContext.h"
 
 
-CfaContext::CfaContext(target_addr_t targetLocation,
-	target_addr_t initialLocation)
+CfaContext::CfaContext()
 	:
-	fTargetLocation(targetLocation),
-	fLocation(initialLocation),
+	fTargetLocation(0),
+	fLocation(0),
 	fCodeAlignment(0),
 	fDataAlignment(0),
 	fReturnAddressRegister(0),
@@ -31,6 +30,15 @@ CfaContext::~CfaContext()
 }
 
 
+void
+CfaContext::SetLocation(target_addr_t targetLocation,
+	target_addr_t initialLocation)
+{
+	fTargetLocation = targetLocation;
+	fLocation = initialLocation;
+}
+
+
 status_t
 CfaContext::Init(uint32 registerCount)
 {
diff --git a/src/apps/debugger/dwarf/CfaContext.h b/src/apps/debugger/dwarf/CfaContext.h
index b652e010c8..78d224cbd2 100644
--- a/src/apps/debugger/dwarf/CfaContext.h
+++ b/src/apps/debugger/dwarf/CfaContext.h
@@ -14,10 +14,12 @@
 
 class CfaContext {
 public:
-								CfaContext(target_addr_t targetLocation,
-									target_addr_t initialLocation);
+								CfaContext();
 								~CfaContext();
 
+			void				SetLocation(target_addr_t targetLocation,
+									target_addr_t initialLocation);
+
 			status_t			Init(uint32 registerCount);
 			status_t			SaveInitialRuleSet();