Kill another bug that I introduced when moving the code into a library