Alter parsing slightly