Feature/parser fallback 161