Fixes split problems (#109) based on kevinswiber's PR (#110)