r21004: Patch from Mathias Dietz <MDIETZ@de.ibm.com> to fix multi-node