Fix for MODCLUSTER-432.