fix collapse
update according to François feedbacks
update