Resolved the inconsistency of separating tokens.