Geometry corrected according to M. Hohlmann indications