Attempt to avoid skipping steps on failure