Add fallback_on_completion (untested)