diff --git a/src/combat.cpp b/src/combat.cpp
index 91ecc21..605809b 100644
--- a/src/combat.cpp
+++ b/src/combat.cpp
@@ -1124,7 +1124,7 @@ void Bot::selectWeapons (float distance, int, int id, int choosen) {
       else if (isShieldDrawn ()
          || m_isReloading
          || (hasEnemy && (m_enemy->v.button & IN_RELOAD))
-         || (!hasEnemy && !seesEntity (m_enemy->v.origin))) {
+         || (hasEnemy && !seesEntity (m_enemy->v.origin))) {
 
          pev->button |= IN_ATTACK2; // draw out the shield
       }
diff --git a/src/linkage.cpp b/src/linkage.cpp
index 227ca83..e516b48 100644
--- a/src/linkage.cpp
+++ b/src/linkage.cpp
@@ -446,7 +446,7 @@ CR_EXPORT int GetEntityAPI (gamefuncs_t *table, int interfaceVersion) {
          // It has been adapted for usage to HLTV spectators, who don't send ClientCommands, but send
          // all their update information to the server using usercmd's instead, it seems.
 
-         if (bots[const_cast <edict_t *> (player)]) {
+         if (!cv_whose_your_daddy && bots[const_cast <edict_t *> (player)]) {
             random_seed = rg (0, 0x7fffffff);
          }
          dllapi.pfnCmdStart (player, cmd, random_seed);