Corrected geometry generation