added fallback parsing