@@ 54,9 54,9 @@ instance PropertyParser p => PropertyParser (TextStyle p) where
     shorthand self "white-space" [Ident val]
         | val `elem` ["normal", "pre", "pre-wrap", "pre-line"] = [("white-space", [Ident val])]
         | otherwise = shorthand (inner self) "white-space" [Ident val]
-    shorthand TextStyle { inner = self' } key value
-        | [(k, _)] <- shorthand self' key $ removeCounters value, k == key = [(key, value)]
-        | otherwise = shorthand self' key value
+    shorthand TextStyle { inner = s } k v
+        | Just _ <- longhand s s k $ removeCounters v = [(k, v)]
+        | otherwise = shorthand s k v
 
     longhand _ self "counter-reset" value = (\v -> self {counterReset = v}) <$> parseCounters 0 value
     longhand _ self "counter-increment" value = (\v -> self {counterIncrement = v}) <$> parseCounters 1 value