diff --git a/jRandomSkills - SRC Files/src/player/PlayerEvents.cs b/jRandomSkills - SRC Files/src/player/PlayerEvents.cs
index 2b4352f..e1a3c58 100644
--- a/jRandomSkills - SRC Files/src/player/PlayerEvents.cs	
+++ b/jRandomSkills - SRC Files/src/player/PlayerEvents.cs	
@@ -320,13 +320,16 @@ namespace jRandomSkills
 
         private static HookResult PlayerDeath(EventPlayerDeath @event, GameEventInfo info)
         {
+            foreach (var playerSkill in Instance.SkillPlayer)
+                if (!playerSkill.IsDrawing)
+                    Instance.SkillAction(playerSkill.Skill.ToString(), "PlayerDeath", [@event]);
+
             var victim = @event.Userid;
             var attacker = @event.Attacker;
             if (victim == null || attacker == null) return HookResult.Continue;
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim.SteamID);
             if (playerInfo == null || playerInfo.IsDrawing) return HookResult.Continue;
-            Instance.SkillAction(playerInfo.Skill.ToString(), "PlayerDeath", [@event]);
             Instance.SkillAction(playerInfo.Skill.ToString(), "DisableSkill", [victim]);
 
             if (victim == attacker) return HookResult.Continue;
diff --git a/jRandomSkills - SRC Files/src/player/skills/RichBoy.cs b/jRandomSkills - SRC Files/src/player/skills/RichBoy.cs
index f73cad6..ef1dc2c 100644
--- a/jRandomSkills - SRC Files/src/player/skills/RichBoy.cs	
+++ b/jRandomSkills - SRC Files/src/player/skills/RichBoy.cs	
@@ -40,7 +40,7 @@ namespace jRandomSkills
             var moneyServices = player.InGameMoneyServices;
             if (moneyServices == null) return;
 
-            moneyServices.Account = Math.Max(moneyServices.Account + money, 0);
+            moneyServices.Account = Math.Min(Math.Max(moneyServices.Account + money, 0), 16000);
             Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInGameMoneyServices");
         }
 
diff --git a/jRandomSkills - Server Files/plugins/jRandomSkills/jRandomSkills.dll b/jRandomSkills - Server Files/plugins/jRandomSkills/jRandomSkills.dll
index 0a27f18..4eb2d04 100644
Binary files a/jRandomSkills - Server Files/plugins/jRandomSkills/jRandomSkills.dll and b/jRandomSkills - Server Files/plugins/jRandomSkills/jRandomSkills.dll differ