diff --git a/lib/smart_monkey/monkey_runner.rb b/lib/smart_monkey/monkey_runner.rb
index 33bafab..a44cf2b 100644
--- a/lib/smart_monkey/monkey_runner.rb
+++ b/lib/smart_monkey/monkey_runner.rb
@@ -198,7 +198,7 @@ def device
       if @options[:device]
         find_device(@options[:device])
       else
-        (devices[0].strip.split("[")[1].delete "]")
+        (devices[0].strip.split("[")[1].split("]")[0])
       end
     end
 
@@ -225,7 +225,8 @@ def find_device(device)
         puts `"instruments" -s devices`
         exit(1)
       end
-      device_line.strip.split("[")[1].delete "]"
+      # device_line.strip.split("[")[1].delete "] (Simulator)"
+      device_line.strip.split("[")[1].split("]")[0]
     end
 
     def instruments_deviceinfo(device)
@@ -234,7 +235,7 @@ def instruments_deviceinfo(device)
 
     def is_simulator
       deviceinfo = instruments_deviceinfo(device)
-      if deviceinfo.include? "Simulator"
+      if deviceinfo.include? "-"
         true
       else
         false