Boundary Bug fixed