fix ordering, match symbols properly