default timeout setting fix

This PR fixes the issue, that the timeout setting is not always respected.