Slightly more elegant fix, no need for new connectfail status.