diff --git a/core/experiments/checksum-oostubs/experiment.cc b/core/experiments/checksum-oostubs/experiment.cc
index 5a8f5e34..fe63230f 100644
--- a/core/experiments/checksum-oostubs/experiment.cc
+++ b/core/experiments/checksum-oostubs/experiment.cc
@@ -123,7 +123,7 @@ bool CoolChecksumExperiment::run()
 
 	fi::BaseEvent* ev = sal::simulator.waitAny();
 	if (ev == &ev_done) {
-		int32_t data = sal::simulator.getRegisterManager().getSetOfType(sal::RT_GP).getRegister(targetreg)->getData();
+		int32_t data = sal::simulator.getRegisterManager().getRegister(targetreg)->getData();
 		log << std::dec << "Result EDX = " << data << endl;
 		param.msg.set_resulttype(CoolChecksumProtoMsg_ResultType_CALCDONE);
 		param.msg.set_resultdata(data);
diff --git a/core/experiments/hscsimple/experiment.cc b/core/experiments/hscsimple/experiment.cc
index a67e60db..60402821 100644
--- a/core/experiments/hscsimple/experiment.cc
+++ b/core/experiments/hscsimple/experiment.cc
@@ -34,7 +34,7 @@ bool hscsimpleExperiment::run()
 #else
 	int reg = sal::RID_EAX;
 #endif
-	sal::simulator.getRegisterManager().getSetOfType(sal::RT_GP).getRegister(reg)->setData(666);
+	sal::simulator.getRegisterManager().getRegister(reg)->setData(666);
 	cout << "[HSC] waiting for last main() instruction" << endl;
 	breakpoint.setWatchInstructionPointer(0x3c92);
 	sal::simulator.addEventAndWait(&breakpoint);