Fix some faulty logic from the refactor, 0.1.1