Fix for Plone-2.0.x