CONN-896: fix for problem found in qa.