Much more natural phrase splitting, bug fix