Improved holder folding.