diff --git a/Fk/Pages/Room.qml b/Fk/Pages/Room.qml
index 35f3b13f..10fd3237 100644
--- a/Fk/Pages/Room.qml
+++ b/Fk/Pages/Room.qml
@@ -101,7 +101,7 @@ Item {
         id: surrenderButton
         text: Backend.translate("Surrender")
         onClicked: {
-          if (isStarted) {
+          if (isStarted && !getPhoto(Self.id).dead) {
             const surrenderCheck = JSON.parse(Backend.callLuaFunction('CheckSurrenderAvailable', [miscStatus.playedTime]));
             if (!surrenderCheck.length) {
               surrenderDialog.informativeText = Backend.translate('Surrender is disabled in this mode');
@@ -149,7 +149,7 @@ Item {
         title: Backend.translate("Quit")
         informativeText: Backend.translate("Are you sure to quit?")
         buttons: MessageDialog.Ok | MessageDialog.Cancel
-        onButtonClicked: function (button, role) {
+        onButtonClicked: function (button) {
           switch (button) {
             case MessageDialog.Ok: {
               ClientInstance.notifyServer("QuitRoom", "[]");
diff --git a/packages/standard/init.lua b/packages/standard/init.lua
index 0e67092f..f81ee459 100644
--- a/packages/standard/init.lua
+++ b/packages/standard/init.lua
@@ -1147,7 +1147,7 @@ local role_mode = fk.CreateGameMode{
         end
 
         if p ~= Self and p.role == "rebel" then
-          if p:isAlive() then
+          if not p.dead then
             break
           else
             rebelNum = rebelNum - 1
@@ -1177,7 +1177,7 @@ local role_mode = fk.CreateGameMode{
             end
 
             if p ~= Self and (p.role == "lord" or p.role == "loyalist") then
-              if p:isAlive() then
+              if not p.dead then
                 break
               else
                 lordNum = lordNum - 1