diff --git a/hbasm/src/lib.rs b/hbasm/src/lib.rs
index 681fd765..36cc276a 100644
--- a/hbasm/src/lib.rs
+++ b/hbasm/src/lib.rs
@@ -92,8 +92,8 @@ macro_rules! expect_matches {
 
 pub fn assembly(code: &str, buf: &mut Vec<u8>) -> Result<(), Error> {
     struct Assembler<'a> {
-        lexer:  Lexer<'a, Token>,
-        buf:    &'a mut Vec<u8>,
+        lexer: Lexer<'a, Token>,
+        buf: &'a mut Vec<u8>,
         lblmap: HashMap<Spur, u64>,
         subset: HashSet<usize>,
     }
@@ -165,7 +165,7 @@ pub fn assembly(code: &str, buf: &mut Vec<u8>) -> Result<(), Error> {
             let imm = match imm {
                 Token::Integer(n) => n.to_le_bytes(),
                 Token::Symbol(s) => {
-                    self.subset.insert(self.buf.len() - 1);
+                    self.subset.insert(self.buf.len());
                     s.into_usize().to_le_bytes()
                 }
                 _ => unreachable!(),
@@ -188,8 +188,8 @@ pub fn assembly(code: &str, buf: &mut Vec<u8>) -> Result<(), Error> {
             let imm = match imm {
                 Token::Integer(n) => n.to_le_bytes(),
                 Token::Symbol(s) => {
-                    self.subset.insert(self.buf.len() - 1);
-                    (s.into_inner().get() as usize).to_le_bytes()
+                    self.subset.insert(self.buf.len());
+                    s.into_usize().to_le_bytes()
                 }
                 _ => unreachable!(),
             };