Fall back to other token types when given incorrect hint

Fall back to other token types when given incorrect hint #2254