diff --git a/magic.sty b/magic.sty
index 903b3a91e438be13a46c1c2ac95eff74e5959396..870878d1a8d2b24e866dd7649540baedb67a8b6c 100644
--- a/magic.sty
+++ b/magic.sty
@@ -36,7 +36,7 @@
 
   {\sffamily(#4
   #3
-  #2)}
+  #2~)}
   Cost:~\arabic{spelllevel},
   \setRange%
   Range:~\spellRange,
@@ -71,8 +71,8 @@
       \fi%
     }%
     {%
-      \setcounter{track}{6}%
-      \addtocounter{track}{-\value{spelllevel}}%
+      \setcounter{track}{20}%
+      \Repeat{\arabic{spelllevel}}{\addtocounter{track}{-4}}%
       \ifnum\value{track}<1%
         \renewcommand\spellRange{touch}%
       \else%