Fix for MODCLUSTER-372.