parsing fix
merged