Fixed issues with splitting