reverted last change at Splitter