Fixing request timeout handling