diff --git a/lib/CPUs/JCpu/tools/jasm.rb b/lib/CPUs/JCpu/tools/jasm.rb
index 4bfd412..88ba703 100644
--- a/lib/CPUs/JCpu/tools/jasm.rb
+++ b/lib/CPUs/JCpu/tools/jasm.rb
@@ -304,14 +304,14 @@ file.each do |raw_line|
 			exit 1
 		end			
 
-		op_line = iline_member[mc+1..mcnt][0].to_s
+		op_line = iline_member[mc+1..mcnt]
 		curr_addr = format("0x%3.3X",obj.pc)
 		opc = token
 		if iline_member[mc+1] != nil
-			op1 = op_line.gsub(/,+.*$/, "")
+			op1 = op_line[0].to_s.gsub(/,+.*$/, "")
 		end	
 		if iline_member[mc+2] != nil
-			op2 = op_line.scan(/,.+$/).to_s.delete(", ")
+			op2 = op_line[1].to_s.gsub(/,+.*$/, "")
 		end	
 		obj.put_instr(name, lc, opc, op1, op2)
 		obj.pc = obj.pc + 1