Splitter to be fixed #136