diff --git a/src/position.h b/src/position.h
index a933c3fa..695ad98d 100644
--- a/src/position.h
+++ b/src/position.h
@@ -423,7 +423,7 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
 }
 
 inline int Position::startpos_ply_counter() const {
-  return startPosPly;
+  return startPosPly + st->pliesFromNull; // HACK
 }
 
 inline bool Position::opposite_colored_bishops() const {
diff --git a/src/uci.cpp b/src/uci.cpp
index 813c40f7..4d68c86a 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -39,7 +39,7 @@ namespace {
 
   // Keep track of position keys along the setup moves (from start position to the
   // position just before to start searching). This is needed by draw detection
-  // where, due to 50 moves rule, we need to ckeck at most 100 plies back.
+  // where, due to 50 moves rule, we need to check at most 100 plies back.
   StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
 
   // UCIParser is a class for parsing UCI input. The class