Fixes a bug in the NextToken view