diff --git a/Grbl_Esp32/src/GCode.cpp b/Grbl_Esp32/src/GCode.cpp
index 8d5391e2..8031c95e 100644
--- a/Grbl_Esp32/src/GCode.cpp
+++ b/Grbl_Esp32/src/GCode.cpp
@@ -142,7 +142,7 @@ Error gc_execute_line(char* line, uint8_t client) {
     uint8_t  gc_parser_flags = GCParserNone;
     auto     n_axis          = number_axis->get();
     float    coord_data[MAX_N_AXIS];  // Used by WCO-related commands
-    uint8_t  pValue;  // Integer value of P word
+    uint8_t  pValue;                  // Integer value of P word
 
     // Determine if the line is a jogging motion or a normal g-code block.
     if (line[0] == '$') {  // NOTE: `$J=` already parsed when passed to this function.
@@ -1478,10 +1478,10 @@ Error gc_execute_line(char* line, uint8_t client) {
             memcpy(gc_state.position, coord_data, sizeof(gc_state.position));
             break;
         case NonModal::SetHome0:
-            coords[CoordIndex::G28]->set(coord_data);
+            coords[CoordIndex::G28]->set(gc_state.position);
             break;
         case NonModal::SetHome1:
-            coords[CoordIndex::G30]->set(coord_data);
+            coords[CoordIndex::G30]->set(gc_state.position);
             break;
         case NonModal::SetCoordinateOffset:
             memcpy(gc_state.coord_offset, gc_block.values.xyz, sizeof(gc_block.values.xyz));
diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h
index fcaf9890..60159039 100644
--- a/Grbl_Esp32/src/Grbl.h
+++ b/Grbl_Esp32/src/Grbl.h
@@ -23,7 +23,7 @@
 // Grbl versioning system
 
 const char* const GRBL_VERSION       = "1.3a";
-const char* const GRBL_VERSION_BUILD = "20200928";
+const char* const GRBL_VERSION_BUILD = "20200929";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>