Fix robust communication