Fix and unit test
Merge pull request #2658 from pboyer/WrongCurves

Unification of Element GeometryObject extraction