diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5643bb7..14a30e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Unreleased
 
+-   fixed crash when using simple type specifiers in friend declarations (#37) (@benjaminulmer)
 -   added workaround for [this issue](https://github.com/mosra/m.css/issues/239) introduced in Doxygen 1.9.7
+-   added auto-linking for various cppreference.com pages
 -   made `--bug-report` keep a copy of the original (pre-pre-processed?) XML
 -   updated m.css
 
diff --git a/src/poxy/run.py b/src/poxy/run.py
index b5031cb..4fe281c 100644
--- a/src/poxy/run.py
+++ b/src/poxy/run.py
@@ -508,7 +508,7 @@ def postprocess_xml(context: Context):
                             if id is not None:
                                 id = str(id)
                             if id and id in member_references and member_references[id] is None:
-                                member_references[refid] = memberdef
+                                member_references[id] = memberdef
                 for id, memberdef in member_references.items():
                     if memberdef is None:
                         context.warning(rf"could not resolve <member> reference with id '{id}'!")
@@ -694,8 +694,10 @@ def postprocess_xml(context: Context):
                                     changed = True
                                     if attr is not None:
                                         member.set(attr, attr_value)
-                                    elif kw == r'friend' and member.get(r'kind') != r'variable':
-                                        member.set(r'kind', r'friend')
+                                    if kw == r'friend' and type.text == r'' and member.get(r'kind') == r'variable':
+                                        type.text = r'friend'
+                                        matched_bad_keyword = False
+                                        break
 
                     # fix issues with trailing return types
                     if 1: