Fix for MODCLUSTER-391 related problems.