Small change on parser