CONN-376: fix for issue identified in QA.