Fixing the fallback logic