diff --git a/Readme.md b/Readme.md
index aa012c1..8289b72 100644
--- a/Readme.md
+++ b/Readme.md
@@ -15,8 +15,8 @@ Display is able to render tiles + sprites, 8x16 sprites are implemented but unte
  - Test 04 passes
  - Test 05 passes
  - Test 06 passes
- - Test 07 fails
- - Test 08 fails
+ - Test 07 passes
+ - Test 08 passes
  - Test 09 passes
  - Test 10 passes
  - Test 11 fails
diff --git a/src/cpu.rs b/src/cpu.rs
index 1c67508..ed31efc 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -709,13 +709,13 @@ impl CPU {
 
     #[inline]
     fn push(&mut self, val: u16) {
-        self.interconnect.write_word(self.sp - 1, val);
+        self.interconnect.write_word(self.sp - 2, val);
         self.sp -= 2;
     }
 
     #[inline]
     fn pop(&mut self) -> u16 {
-        let v: u16 = self.interconnect.read_word(self.sp + 1);
+        let v: u16 = self.interconnect.read_word(self.sp);
         self.sp += 2;
         v
     }