Fix for PIMS-2850