Modcluster 390

It fixes MODCLUSTER-390 and another side effect of MODCLUSTER-372.