Fix 13866 for master

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