More attempts to get the geometry to line up, see #4