Fixing last tokens