Fixes #5796

Also fixes https://github.com/UristMcStation/UristMcStation/issues/98