Solve issue with change in token-field