update to match EBNF change fixing issue 27