Restart logic improved - #29