be more failsafe