Fixed issue with token not being split correctly