Fixed YET ANOTHER bug in the parser