Fix Token Generator