Handle no-attachment case. Handle firstBoundary better