Before removing global timeout
some more fix