diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a61b2f..5790699 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 ## Canary
+* 'Non-binary' kink is now respected in gender matching  (credit: [@FatCatClient](https://github.com/FatCatClient))
+* OpenMoji is now treated as a fallback font  (credit: [@FatCatClient](https://github.com/FatCatClient))
+* 
+
 * Add high-quality portraits to Profile Helper
 * FBot should always be a UNICORN match
 * FBot should have extra buttons to help one-handed
diff --git a/learn/matcher.ts b/learn/matcher.ts
index 4ab766f..5c60f49 100644
--- a/learn/matcher.ts
+++ b/learn/matcher.ts
@@ -746,8 +746,12 @@ export class Matcher {
                     Orientation.BiFemalePreference,
                     Orientation.BiMalePreference
                 ].includes(yourOrientation)) {
-                    let nonBinaryPref:KinkPreference|null = Matcher.getKinkPreference(you, Kink.Nonbinary);
-                    if(nonBinaryPref != null) return Matcher.formatKinkScore(nonBinaryPref, 'non-binary genders');
+                    const nonBinaryPref = Matcher.getKinkPreference(you, Kink.Nonbinary);
+
+                    if(nonBinaryPref) {
+                        return Matcher.formatKinkScore(nonBinaryPref, 'non-binary genders');
+                    }
+
                     return new Score(Scoring.MISMATCH, 'No <span>non-binary</span> genders');
                 }
             }
@@ -1093,8 +1097,9 @@ export class Matcher {
     }
 
     static getKinkGenderPreference(c: Character, gender: Gender): KinkPreference | null {
-        if (!(gender in genderKinkMapping))
+        if (!(gender in genderKinkMapping)) {
             return null;
+        }
 
         return Matcher.getKinkPreference(c, genderKinkMapping[gender]);
     }