Tagged geometry-correction