Better fail-safe mode