Add workaround for geometry merging crash