diff --git a/VERSION b/VERSION
index 3b2c983b..442e0c68 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.2.2-rc15
+9.2.2-rc16
diff --git a/farmbot_core/lib/farmbot_core/asset.ex b/farmbot_core/lib/farmbot_core/asset.ex
index cfdb7cb2..457d4d9f 100644
--- a/farmbot_core/lib/farmbot_core/asset.ex
+++ b/farmbot_core/lib/farmbot_core/asset.ex
@@ -323,8 +323,10 @@ defmodule FarmbotCore.Asset do
         # the DB / API.
         sorted = CriteriaRetriever.run(point_group)
           |> sort_points(sort_by || "xy_ascending")
-          |> Enum.map(&Map.fetch!(&1, :id))
+          |> Enum.map(fn point -> point.id end)
 
+        count = Enum.count(sorted)
+        Logger.debug("There are #{count} points. #{inspect(sorted)}")
         %{ point_group | point_ids: sorted }
       other ->
         # Swallow all other errors
diff --git a/farmbot_os/lib/avrdude.ex b/farmbot_os/lib/avrdude.ex
index 6296ce2a..10393c98 100644
--- a/farmbot_os/lib/avrdude.ex
+++ b/farmbot_os/lib/avrdude.ex
@@ -29,8 +29,6 @@ defmodule Avrdude do
       "-Uflash:w:#{hex_path}:i"
     ]
 
-    # call the function for resetting the line before executing avrdude.
-    call_reset_fun(reset_fun)
     FarmbotCore.Logger.info(3, "Writing firmware to MCU...")
 
     FarmbotCore.Logger.debug(
@@ -50,12 +48,11 @@ defmodule Avrdude do
       {a, exit_code} = result
       FarmbotCore.Logger.info(3, inspect(a))
       FarmbotCore.Logger.info(3, "Exit code #{exit_code}")
-      # Manually override errors while debugging.
-      {a, 0}
-    else
-      result
     end
 
+    call_reset_fun(reset_fun)
+
+    result
   end
 
   def call_reset_fun(reset_fun) do