Fix: splitter race condition