--- a/Commands/Delete All Breakpoints.tmCommand	
+++ b/Commands/Delete All Breakpoints.tmCommand	
@@ -11,14 +11,15 @@ require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/rdebug_cmd.rb"
 
 
 dcmd = DebuggerCmd.new
-count_breakpoints = dcmd.remote_eval_control_binding("Debugger.breakpoints.length").to_i
+count_breakpoints = eval(dcmd.remote_eval_control_binding("Debugger.breakpoints.length"))
 if count_breakpoints == 0
   puts "There are no breakpoints set"
   exit
 end
 
-dcmd.remote_eval_control_binding("Debugger.breakpoints.each { |b| Debugger.remove_breakpoint(b.id) }").to_i
-new_count_breakpoints = dcmd.remote_eval_control_binding("Debugger.breakpoints.length").to_i
+dcmd.remote_eval_control_binding("Debugger.breakpoints.map{ |b| b.id }.each { |b_id| Debugger.remove_breakpoint(b_id) }")
+
+new_count_breakpoints = eval(dcmd.remote_eval_control_binding("Debugger.breakpoints.length"))
 if new_count_breakpoints == 0
   puts "Deleted all #{count_breakpoints} breakpoint(s)"
 else

--- a/Commands/Set Breakpoint at Current Line.tmCommand	
+++ b/Commands/Set Breakpoint at Current Line.tmCommand	
@@ -9,11 +9,19 @@
 
 require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/rdebug_cmd.rb"
 
-cmd = "break #{ENV['TM_FILEPATH']}:#{ENV['TM_LINE_NUMBER']}"
-msg = 'Breakpoint added.'
 
 dcmd = DebuggerCmd.new
-dcmd.send_command(cmd, msg)</string>
+result = dcmd.remote_eval_control_binding &lt;&lt;-EOF
+  bp = Debugger.add_breakpoint #{ENV['TM_FILEPATH'].to_s.inspect}, #{ENV['TM_LINE_NUMBER']}
+  if bp
+    "Set breakpoint at \#{bp.source}:\#{bp.pos}"
+  else
+    "Failed to set breakpoint."
+  end
+EOF
+
+puts eval(result)
+</string>
 	<key>fallbackInput</key>
 	<string>line</string>
 	<key>input</key>