Fixed parser (again)