fix tokens