This did not work, let me test more...

The failsafe stuff is already in #897