Fixing failsafe initialisation, failsafe work as it did before
e969d184e6e9816cf4eb6264e81e72a9564bd901