Fixes for splitting in the wrong place (issue #63)