BS-8918
Improve folding behavior