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

Suggested fix for:
https://dev.plone.org/ticket/13716