refs #5 - and solves the clash problem for now

refs #5. Tested on Plone 4.3. Marginal changes.