CGIV-2206 logic fix