move fallback to an earlier stage