adding fallback support