Change a little bit how the parser behave with the variables