Fix for MODCLUSTER-335.