Request/Response over Gateway fails to correlate, fixes #1411