Final bug fix with ANTLR hard hacking ;)