Added additional fallback cases