diff --git a/src/simulator/machine.rs b/src/simulator/machine.rs
index 3a5fbfa..d97ba50 100644
--- a/src/simulator/machine.rs
+++ b/src/simulator/machine.rs
@@ -455,19 +455,19 @@ impl Machine {
 			RISCV_FP => {
 				match inst.funct7 {
 					RISCV_FP_ADD => {
-						machine.fp_reg[inst.rd as usize] = machine.fp_reg[inst.rs1 as usize] + machine.fp_reg[inst.rs2 as usize];
+						machine.fp_reg.set_reg(inst.rd as usize, machine.fp_reg.get_reg(inst.rs1 as usize) + machine.fp_reg.get_reg(inst.rs2 as usize));
 					},
 					RISCV_FP_SUB => {
-						machine.fp_reg[inst.rd as usize] = machine.fp_reg[inst.rs1 as usize] - machine.fp_reg[inst.rs2 as usize];
+						machine.fp_reg.set_reg(inst.rd as usize, machine.fp_reg.get_reg(inst.rs1 as usize) - machine.fp_reg.get_reg(inst.rs2 as usize));
 					},
 					RISCV_FP_MUL => {
-						machine.fp_reg[inst.rd as usize] = machine.fp_reg[inst.rs1 as usize] * machine.fp_reg[inst.rs2 as usize];
+						machine.fp_reg.set_reg(inst.rd as usize, machine.fp_reg.get_reg(inst.rs1 as usize) * machine.fp_reg.get_reg(inst.rs2 as usize));
 					},
 					RISCV_FP_DIV => {
-						machine.fp_reg[inst.rd as usize] = machine.fp_reg[inst.rs1 as usize] / machine.fp_reg[inst.rs2 as usize];
+						machine.fp_reg.set_reg(inst.rd as usize, machine.fp_reg.get_reg(inst.rs1 as usize) / machine.fp_reg.get_reg(inst.rs2 as usize));
 					},
 					RISCV_FP_SQRT => {
-						machine.fp_reg[inst.rd as usize] = machine.fp_reg[inst.rs1 as usize].sqrt();
+						machine.fp_reg.set_reg(inst.rd as usize, machine.fp_reg.get_reg(inst.rs1 as usize).sqrt());
 					},
 					RISCV_FP_FSGN => {
 						let local_float = machine.fp_reg[inst.rs1 as usize];