Slightly rejigger that logic, shouldn't be in auto_fail