Fix for https://dev.plone.org/ticket/13716