FAILSAFE fixes #27