Fixed broken splitter handling.