Fixes a problem with timeouts