Fix for CLINPORTAL-6973
Fix for CLINPORTAL-6972