FIx fallback path and test.