Fix for MODCLUSTER-390.