Resolve this merge conflict that I somehow 100% totally missed (fixes #63)