Bug 910653 - Workaround issues with syntax errors