and a fix for the splitter code