Oh my god for fuck sake how did I even. fixes #39 and probably fixes #25