Boundary collision slight improvement