fix some corner cases of timeout induced fails