BUG: fix lower and upper cutting