Added detection of split token