From b4e0aea2b73e2cde6968dac72fb1b2c9fcb5a17b Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sun, 14 Aug 2022 19:25:49 -0700
Subject: [PATCH] Merged bugfixes

Brings in: 9497f6e671dff3c742ce9a4ec7d8226bff102121
Closes #512

Thanks, jelle!

Signed-off-by: Kevin Morris <kevr@0cost.org>