Revert "Revert "Geometry (failed :-1: )""

This reverts commit a3ca8bc11d611c630b488b1562054f1f753a0ee9.
Fixed geometry