fix more cases where parsing fails