parser stability bugfixes