Fail safe added