CONN-377: fix for issue found in QA.