affine gap broken out, relates to #325