fix broken tokens