added fallback support