fixing with tokens