Fix a bug where WSplit runs cause 500s