Fixing broken tokens