Ticket 13462

Fix for the problem described in: https://dev.plone.org/ticket/13462