Initial geometry fix