Fixing fallback issue