Better breaking point detection

Better breaking point detection