diff --git a/monsters.sty b/monsters.sty
index fa0d664653759d919f9c9df732e6dafb26385655..e617381e3064ac69a0f8a62ea073bdba6a3bdf52 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -311,15 +311,16 @@
       \fi
     }% SKILLS
     {%
-      \ifnum\value{Wits}>\value{Charisma}%
-        \snapcaster%
+      \ifnum\value{Charisma}<1%
+        \snapcaster, %
       \fi%
       \ifcase\value{r4b}\relax%
+      \or%
         \lucky%
       \or%
         \dodger%
       \or%
-        \specialist{rapier}%
+        \weaponmaster%
       \else%
         \fasthealer%
       \fi%