ugly parser failure partially fixed