Hotfix: splitter race condition