Boundary fix