Fix for updated API (bug 882114)