Add more fail-safe