Fix for MODCLUSTER-389.