hardening around timeouts
0.2.1