Good catch.  Sorry this fix has been hanging out in one of my dev branches and I need to get it merged into next.  Sorry you had to fight it.