1 files changed, 5 insertions, 3 deletions

diff --git a/bbcode/src/Text/BBCode/Lexer.hs b/bbcode/src/Text/BBCode/Lexer.hs
index 2eb0022..1c20928 100644
--- a/bbcode/src/Text/BBCode/Lexer.hs
+++ b/bbcode/src/Text/BBCode/Lexer.hs
@@ -33,15 +33,17 @@ token = BBClose <$> ("[/" *> escapedText' [']'] <* "]")
         <|> BBStr <$> escapedText ['[']
 
 openTag :: Parser (Text, [(Text, Maybe Text)])
-openTag = (,) <$> ("[" *> escapedText' [']', ' ']) <*> (option [] attrs <* "]")
+openTag = (,) <$ "[" <*> escapedText' [']', ' '] <* takeWhile isSpace <*> attrs' <* "]"
 
 attrs :: Parser [(Text, Maybe Text)]
-attrs = (:) <$> (attrs' <* takeWhile isSpace) <*> (option [] $ attrs)
+attrs = (:) <$> ((,) <$> escapedText ['=', ']', ' '] <*> optional ("=" *> attrArg)) <* takeWhile isSpace <*> attrs'
   where
-    attrs' = (,) <$> escapedText ['=', ']', ' '] <*> optional ("=" *> attrArg)
     attrArg = "\"" *> escapedText ['"'] <* "\""
               <|> escapedText [']', ' ']
 
+attrs' :: Parser [(Text, Maybe Text)]
+attrs' = option [] attrs
+
 escapedText :: [Char] -> Parser Text
 -- ^ @escapedText cs@ consumes 'Text' up to (not including) the first occurence of a character from @cs@ that is not escaped using @\\@
 --