more parser fixing