Cool. An upstream fix would be better.