failsafe version of f9eaa29b