fixed the WithBoundaries extension