Fallback mode for #798