Failsafe was failing...not anymore