Another try to fix the cut issue