bug fix stretch.