Fix for CLINPORTAL-6088