Fixing rich geometry