diff --git a/common/server/game/server_player.cpp b/common/server/game/server_player.cpp
index 886e6b8bf..d5598e138 100644
--- a/common/server/game/server_player.cpp
+++ b/common/server/game/server_player.cpp
@@ -426,6 +426,31 @@ Server_Player::cmdUndoDraw(const Command_UndoDraw & /*cmd*/, ResponseContainer &
     return retVal;
 }
 
+Response::ResponseCode
+Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_Counter *c = counters.value(cmd.counter_id(), 0);
+    if (!c) {
+        return Response::RespNameNotFound;
+    }
+
+    c->setCount(c->getCount() + cmd.delta());
+
+    Event_SetCounter event;
+    event.set_counter_id(c->getId());
+    event.set_value(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
 Response::ResponseCode
 Server_Player::cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
@@ -452,31 +477,6 @@ Server_Player::cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContai
     return Response::RespOk;
 }
 
-Response::ResponseCode
-Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    Server_Counter *c = counters.value(cmd.counter_id(), 0);
-    if (!c) {
-        return Response::RespNameNotFound;
-    }
-
-    c->setCount(c->getCount() + cmd.delta());
-
-    Event_SetCounter event;
-    event.set_counter_id(c->getId());
-    event.set_value(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
-
-    return Response::RespOk;
-}
-
 Response::ResponseCode
 Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
@@ -526,21 +526,6 @@ Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &
     return Response::RespOk;
 }
 
-Response::ResponseCode Server_Player::cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                              ResponseContainer &rc,
-                                                              GameEventStorage &ges)
-{
-    auto ret = Server_AbstractPlayer::cmdChangeZoneProperties(cmd, rc, ges);
-
-    Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name()));
-    if (!zone) {
-        return Response::RespNameNotFound;
-    }
-
-    revealTopCardIfNeeded(zone, ges);
-    return ret;
-}
-
 Response::ResponseCode
 Server_Player::cmdNextTurn(const Command_NextTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage & /*ges*/)
 {
@@ -579,6 +564,21 @@ Response::ResponseCode Server_Player::cmdSetActivePhase(const Command_SetActiveP
     return Response::RespOk;
 }
 
+Response::ResponseCode Server_Player::cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
+                                                              ResponseContainer &rc,
+                                                              GameEventStorage &ges)
+{
+    auto ret = Server_AbstractPlayer::cmdChangeZoneProperties(cmd, rc, ges);
+
+    Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name()));
+    if (!zone) {
+        return Response::RespNameNotFound;
+    }
+
+    revealTopCardIfNeeded(zone, ges);
+    return ret;
+}
+
 Response::ResponseCode
 Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer &rc, GameEventStorage &ges)
 {
diff --git a/common/server/game/server_player.h b/common/server/game/server_player.h
index 1ec89cd5f..5925ed3c2 100644
--- a/common/server/game/server_player.h
+++ b/common/server/game/server_player.h
@@ -56,15 +56,15 @@ public:
     cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
     Response::ResponseCode
     cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                   ResponseContainer &rc,
-                                                   GameEventStorage &ges) override;
     Response::ResponseCode
     cmdNextTurn(const Command_NextTurn &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
     Response::ResponseCode
     cmdSetActivePhase(const Command_SetActivePhase &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
     Response::ResponseCode
     cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges) override;
+    Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
+                                                   ResponseContainer &rc,
+                                                   GameEventStorage &ges) override;
 
     void getInfo(ServerInfo_Player *info,
                  Server_AbstractParticipant *playerWhosAsking,