Fix for MODCLUSTER-349.