CONN-443: Fix for issue found in QA.