Added failsafe