added map fallback