Fixing the bug of tokens where aren't spread