make custom timeout propagate throughout. tentative fix for issue #2