Fixed https://dev.plone.org/ticket/13506 for 2.2.x