Yea, that old logic was janky. I rewrote it just now with something better.