maybe this should rather be done in the parser?