Change parsing behavior #2