Apparently fixes #19 without breaking stuff, so here we go.