splitter fix, and fix for #202
fix for #203 - maybe?