Fix for trunk after rev 223802