switch order of term parsing